summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2011-11-27 00:22:12 +0000
committerBertrik Sikken <bertrik@sikken.nl>2011-11-27 00:22:12 +0000
commit99ea0c5051d51b8cd72e009b96442942f1766792 (patch)
tree437f3cfddf9ab66dae0d8cb673c500d49b2d3790
parenta89c705ecbc947e7f49ff30d5ec5bf6a7be4670b (diff)
downloadrockbox-99ea0c5051d51b8cd72e009b96442942f1766792.zip
rockbox-99ea0c5051d51b8cd72e009b96442942f1766792.tar.gz
rockbox-99ea0c5051d51b8cd72e009b96442942f1766792.tar.bz2
rockbox-99ea0c5051d51b8cd72e009b96442942f1766792.tar.xz
Sansa AMSv2 USB: Simplify union around struct usb_ctrlrequest and remove duplicate alignment attribute
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31065 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/usb-drv-as3525v2.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c
index 3d4f157..9954484 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525v2.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c
@@ -95,13 +95,10 @@ static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS][2];
e.g. write descriptor requests (which are rejected by us, but the
payload is transferred anyway) do not cause memory corruption.
Fixes FS#12310. -- Michael Sparmann (theseven) */
-static struct
-{
- union {
- struct usb_ctrlrequest header; /* 8 bytes */
- unsigned char payload[64];
- };
-} _ep0_setup_pkt USB_DEVBSS_ATTR __attribute__((aligned(32)));
+static union {
+ struct usb_ctrlrequest header; /* 8 bytes */
+ unsigned char payload[64];
+} _ep0_setup_pkt USB_DEVBSS_ATTR;
static struct usb_ctrlrequest *ep0_setup_pkt = AS3525_UNCACHED_ADDR(&_ep0_setup_pkt.header);