diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2011-11-27 00:22:12 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-11-27 00:22:12 +0000 |
commit | 99ea0c5051d51b8cd72e009b96442942f1766792 (patch) | |
tree | 437f3cfddf9ab66dae0d8cb673c500d49b2d3790 /firmware/target/arm/as3525 | |
parent | a89c705ecbc947e7f49ff30d5ec5bf6a7be4670b (diff) | |
download | rockbox-99ea0c5051d51b8cd72e009b96442942f1766792.tar.gz rockbox-99ea0c5051d51b8cd72e009b96442942f1766792.zip |
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
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525v2.c | 11 |
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 3d4f1579c5..9954484f01 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]; | |||
95 | e.g. write descriptor requests (which are rejected by us, but the | 95 | e.g. write descriptor requests (which are rejected by us, but the |
96 | payload is transferred anyway) do not cause memory corruption. | 96 | payload is transferred anyway) do not cause memory corruption. |
97 | Fixes FS#12310. -- Michael Sparmann (theseven) */ | 97 | Fixes FS#12310. -- Michael Sparmann (theseven) */ |
98 | static struct | 98 | static union { |
99 | { | 99 | struct usb_ctrlrequest header; /* 8 bytes */ |
100 | union { | 100 | unsigned char payload[64]; |
101 | struct usb_ctrlrequest header; /* 8 bytes */ | 101 | } _ep0_setup_pkt USB_DEVBSS_ATTR; |
102 | unsigned char payload[64]; | ||
103 | }; | ||
104 | } _ep0_setup_pkt USB_DEVBSS_ATTR __attribute__((aligned(32))); | ||
105 | 102 | ||
106 | static struct usb_ctrlrequest *ep0_setup_pkt = AS3525_UNCACHED_ADDR(&_ep0_setup_pkt.header); | 103 | static struct usb_ctrlrequest *ep0_setup_pkt = AS3525_UNCACHED_ADDR(&_ep0_setup_pkt.header); |
107 | 104 | ||