summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525/usb-drv-as3525v2.c
diff options
context:
space:
mode:
authorAmaury Pouly <pamaury@rockbox.org>2010-09-02 13:46:34 +0000
committerAmaury Pouly <pamaury@rockbox.org>2010-09-02 13:46:34 +0000
commitf3da8d0ee3dc61b2d106ef617b761da5ea459f37 (patch)
tree9ebafd7b589b202685b8fb558c43d23c9954f7b6 /firmware/target/arm/as3525/usb-drv-as3525v2.c
parente09a0857e8a31d29b77ee5d82e7db769403c11c0 (diff)
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
Diffstat (limited to 'firmware/target/arm/as3525/usb-drv-as3525v2.c')
-rw-r--r--firmware/target/arm/as3525/usb-drv-as3525v2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c
index 2dfc69b580..433606f6d0 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525v2.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c
@@ -36,8 +36,6 @@
#include "usb-drv-as3525v2.h"
#include "usb_core.h"
-#define panicf(...) ({logf(__VA_ARGS__); DCTL |= DCTL_sftdiscon; /* disconnect */})
-
static int __in_ep_list[NUM_IN_EP] = {IN_EP_LIST};
static int __out_ep_list[NUM_OUT_EP] = {OUT_EP_LIST};
static int __in_ep_list_ep0[NUM_IN_EP + 1] = {0, IN_EP_LIST};
@@ -101,7 +99,7 @@ enum ep0state
/* endpoints[ep_num][DIR_IN/DIR_OUT] */
static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS][2];
/* setup packet for EP0 */
-static struct usb_ctrlrequest ep0_setup_pkt USB_DEVBSS_ATTR;
+static struct usb_ctrlrequest ep0_setup_pkt __attribute__((aligned(32)));
/* state of EP0 */
static enum ep0state ep0_state;