diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-03-11 06:47:39 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-03-11 06:47:39 +0000 |
| commit | 6fa3988a899e1b9b0695ef6d95ddd5972f5f165b (patch) | |
| tree | 96fedf9dcc53d7bea53f4f01dd6a7cb3a73b6c21 /LUFA/Drivers/USB/Class/Common/CDC.h | |
| parent | 089ff21507b0a7f61ebeb6f575a8271701515d1d (diff) | |
Add structure padding to the appropriate descriptor structures to maintain correct alignments on larger architectures.
Fix EVK1101 swapped joystick Right/Down masks.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1700 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers/USB/Class/Common/CDC.h')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/CDC.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h index cfaebb85..91686d86 100644 --- a/LUFA/Drivers/USB/Class/Common/CDC.h +++ b/LUFA/Drivers/USB/Class/Common/CDC.h @@ -241,7 +241,7 @@ uint16_t CDCSpecification; /**< Version number of the CDC specification implemented by the device, * encoded in BCD format. */ - } USB_CDC_Descriptor_FunctionalHeader_t; + } ATTR_PACKED USB_CDC_Descriptor_FunctionalHeader_t; /** \brief CDC class-specific Functional Header Descriptor (USB-IF naming conventions). * @@ -262,7 +262,7 @@ * must be \ref CDC_DSUBTYPE_CSInterface_Header. */ uint16_t bcdCDC; /**< Version number of the CDC specification implemented by the device, encoded in BCD format. */ - } USB_CDC_StdDescriptor_FunctionalHeader_t; + } ATTR_PACKED USB_CDC_StdDescriptor_FunctionalHeader_t; /** \brief CDC class-specific Functional ACM Descriptor (LUFA naming conventions). * @@ -281,7 +281,7 @@ * this should be set to a fixed value of 0x06 - for other capabilities, refer * to the CDC ACM specification. */ - } USB_CDC_Descriptor_FunctionalACM_t; + } ATTR_PACKED USB_CDC_Descriptor_FunctionalACM_t; /** \brief CDC class-specific Functional ACM Descriptor (USB-IF naming conventions). * @@ -304,7 +304,7 @@ * this should be set to a fixed value of 0x06 - for other capabilities, refer * to the CDC ACM specification. */ - } USB_CDC_StdDescriptor_FunctionalACM_t; + } ATTR_PACKED USB_CDC_StdDescriptor_FunctionalACM_t; /** \brief CDC class-specific Functional Union Descriptor (LUFA naming conventions). * @@ -321,7 +321,7 @@ */ uint8_t MasterInterfaceNumber; /**< Interface number of the CDC Control interface. */ uint8_t SlaveInterfaceNumber; /**< Interface number of the CDC Data interface. */ - } USB_CDC_Descriptor_FunctionalUnion_t; + } ATTR_PACKED USB_CDC_Descriptor_FunctionalUnion_t; /** \brief CDC class-specific Functional Union Descriptor (USB-IF naming conventions). * @@ -342,7 +342,7 @@ */ uint8_t bMasterInterface; /**< Interface number of the CDC Control interface. */ uint8_t bSlaveInterface0; /**< Interface number of the CDC Data interface. */ - } USB_CDC_StdDescriptor_FunctionalUnion_t; + } ATTR_PACKED USB_CDC_StdDescriptor_FunctionalUnion_t; /** \brief CDC Virtual Serial Port Line Encoding Settings Structure. * @@ -359,7 +359,7 @@ * \ref CDC_LineEncodingParity_t enum. */ uint8_t DataBits; /**< Bits of data per character of the virtual serial port. */ - } CDC_LineEncoding_t; + } ATTR_PACKED CDC_LineEncoding_t; /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus) |