X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3d4d8e7f628f9dc9981242f69b097333faa9940d..d8fe01f19a48b960f5f82735b38ab798d07f2891:/LUFA/Drivers/USB/Class/Common/CDC.h

diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h
index c63c0b537..e74b0f1dd 100644
--- a/LUFA/Drivers/USB/Class/Common/CDC.h
+++ b/LUFA/Drivers/USB/Class/Common/CDC.h
@@ -51,9 +51,7 @@
 #define _CDC_CLASS_COMMON_H_
 
 	/* Includes: */
-		#include "../../HighLevel/StdDescriptors.h"
-
-		#include <string.h>
+		#include "../../Core/StdDescriptors.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
@@ -147,10 +145,10 @@
 			CDC_CSCP_ATCommandProtocol      = 0x01, /**< Descriptor Protocol value indicating that the device or interface
 			                                         *   belongs to the AT Command protocol of the CDC class.
 			                                         */
-			CDC_CSCP_NoSpecificProtocol     = 0x00, /**< Descriptor Class value indicating that the device or interface
+			CDC_CSCP_NoSpecificProtocol     = 0x00, /**< Descriptor Protocol value indicating that the device or interface
 			                                         *   belongs to no specific protocol of the CDC class.
 			                                         */
-			CDC_CSCP_VendorSpecificProtocol = 0xFF, /**< Descriptor Class value indicating that the device or interface
+			CDC_CSCP_VendorSpecificProtocol = 0xFF, /**< Descriptor Protocol value indicating that the device or interface
 			                                         *   belongs to a vendor-specific protocol of the CDC class.
 			                                         */
 			CDC_CSCP_CDCDataClass           = 0x0A, /**< Descriptor Class value indicating that the device or interface
@@ -243,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).
 		 *
@@ -264,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).
 		 *
@@ -283,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).
 		 *
@@ -306,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).
 		 *
@@ -323,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).
 		 *
@@ -344,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.
 		 *
@@ -361,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)