Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
as3525v2: revert the USB_DEVBSS_ATTR and the panicf redefinition, don't protected #undef of USB_NUM_ENDPOINTS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27987 a1c6a512-1295-4272-9138-f99709370657
+1
-10
-7
firmware/export/as3525v2.h
-7
firmware/export/as3525v2.h
···
34
34
35
35
#define CGU_SDSLOT (*(volatile unsigned long *)(CGU_BASE + 0x3C))
36
36
37
-
#ifdef USB_NUM_ENDPOINTS
38
37
#undef USB_NUM_ENDPOINTS
39
-
#endif
40
-
41
-
#ifdef USB_DEVBSS_ATTR
42
-
#undef USB_DEVBSS_ATTR
43
-
#endif
44
38
45
39
#define USB_NUM_ENDPOINTS 6
46
-
#define USB_DEVBSS_ATTR __attribute__((aligned(32)))
47
40
48
41
#define CCU_USB (*(volatile unsigned long *)(CCU_BASE + 0x20))
49
42
+1
-3
firmware/target/arm/as3525/usb-drv-as3525v2.c
+1
-3
firmware/target/arm/as3525/usb-drv-as3525v2.c
···
36
36
#include "usb-drv-as3525v2.h"
37
37
#include "usb_core.h"
38
38
39
-
#define panicf(...) ({logf(__VA_ARGS__); DCTL |= DCTL_sftdiscon; /* disconnect */})
40
-
41
39
static int __in_ep_list[NUM_IN_EP] = {IN_EP_LIST};
42
40
static int __out_ep_list[NUM_OUT_EP] = {OUT_EP_LIST};
43
41
static int __in_ep_list_ep0[NUM_IN_EP + 1] = {0, IN_EP_LIST};
···
101
99
/* endpoints[ep_num][DIR_IN/DIR_OUT] */
102
100
static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS][2];
103
101
/* setup packet for EP0 */
104
-
static struct usb_ctrlrequest ep0_setup_pkt USB_DEVBSS_ATTR;
102
+
static struct usb_ctrlrequest ep0_setup_pkt __attribute__((aligned(32)));
105
103
/* state of EP0 */
106
104
static enum ep0state ep0_state;
107
105