diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-02-29 18:33:54 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-02-29 18:33:54 +0000 |
commit | f712c7ff361c327376f9773d34be02428e01e080 (patch) | |
tree | e54f3fb8d002395c1175bf5d54535dfbafafb8e7 /firmware/export | |
parent | d6adda13566cc71d1ca931eb95b117dcbcd54998 (diff) | |
download | rockbox-f712c7ff361c327376f9773d34be02428e01e080.tar.gz rockbox-f712c7ff361c327376f9773d34be02428e01e080.zip |
fix alignment and packed-ness of USB structs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16455 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/usb_ch9.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/export/usb_ch9.h b/firmware/export/usb_ch9.h index 4c272c338a..1bfc152a8a 100644 --- a/firmware/export/usb_ch9.h +++ b/firmware/export/usb_ch9.h | |||
@@ -227,7 +227,7 @@ struct usb_config_descriptor { | |||
227 | uint8_t iConfiguration; | 227 | uint8_t iConfiguration; |
228 | uint8_t bmAttributes; | 228 | uint8_t bmAttributes; |
229 | uint8_t bMaxPower; | 229 | uint8_t bMaxPower; |
230 | } __attribute__ ((packed,aligned(2))); | 230 | } __attribute__ ((packed)); |
231 | 231 | ||
232 | #define USB_DT_CONFIG_SIZE 9 | 232 | #define USB_DT_CONFIG_SIZE 9 |
233 | 233 | ||
@@ -245,7 +245,7 @@ struct usb_string_descriptor { | |||
245 | uint8_t bDescriptorType; | 245 | uint8_t bDescriptorType; |
246 | 246 | ||
247 | uint16_t wString[]; /* UTF-16LE encoded */ | 247 | uint16_t wString[]; /* UTF-16LE encoded */ |
248 | } __attribute__ ((packed,aligned(2))); | 248 | } __attribute__ ((packed)); |
249 | 249 | ||
250 | /* note that "string" zero is special, it holds language codes that | 250 | /* note that "string" zero is special, it holds language codes that |
251 | * the device supports, not Unicode characters. | 251 | * the device supports, not Unicode characters. |
@@ -285,7 +285,7 @@ struct usb_endpoint_descriptor { | |||
285 | /* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */ | 285 | /* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */ |
286 | //uint8_t bRefresh; | 286 | //uint8_t bRefresh; |
287 | //uint8_t bSynchAddress; | 287 | //uint8_t bSynchAddress; |
288 | } __attribute__ ((packed,aligned(2))); | 288 | } __attribute__ ((packed)); |
289 | 289 | ||
290 | #define USB_DT_ENDPOINT_SIZE 7 | 290 | #define USB_DT_ENDPOINT_SIZE 7 |
291 | #define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ | 291 | #define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ |
@@ -304,7 +304,7 @@ struct usb_qualifier_descriptor { | |||
304 | uint8_t bMaxPacketSize0; | 304 | uint8_t bMaxPacketSize0; |
305 | uint8_t bNumConfigurations; | 305 | uint8_t bNumConfigurations; |
306 | uint8_t bRESERVED; | 306 | uint8_t bRESERVED; |
307 | } __attribute__ ((packed,aligned(2))); | 307 | } __attribute__ ((packed)); |
308 | 308 | ||
309 | /*-------------------------------------------------------------------------*/ | 309 | /*-------------------------------------------------------------------------*/ |
310 | 310 | ||