diff options
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/Audio.h | 56 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/HID.h | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/MIDI.h | 16 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/CDC.h | 2 | 
4 files changed, 41 insertions, 41 deletions
| diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h index ec7f148a7..8ee5fa2cb 100644 --- a/LUFA/Drivers/USB/Class/Common/Audio.h +++ b/LUFA/Drivers/USB/Class/Common/Audio.h @@ -269,8 +269,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ @@ -316,8 +316,8 @@  		{  			uint8_t bLength; /**< Size of the descriptor, in bytes. */  			uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                          *   given by the specific class. +			                          */  			uint8_t bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ @@ -346,8 +346,8 @@  			uint8_t                 TerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */  			uint16_t                TerminalType; /**< Type of terminal, a TERMINAL_* mask. */  			uint8_t                 AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals -			                                                     *   such as the speaker and microphone of a phone handset. -			                                                     */ +			                                                   *   such as the speaker and microphone of a phone handset. +			                                                   */  			uint8_t                 TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */  			uint16_t                ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal. */ @@ -368,8 +368,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */  			uint8_t  bTerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */ @@ -420,8 +420,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */		  			uint8_t  bTerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */ @@ -464,8 +464,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */		 @@ -522,8 +522,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */		 @@ -564,25 +564,25 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a -									   *   value given by the specific class. -									   */ +			                           *   value given by the specific class. +			                           */  			uint8_t  bEndpointAddress; /**< Logical address of the endpoint within the device for the current  -										*   configuration, including direction mask. -										*/ +			                            *   configuration, including direction mask. +			                            */  			uint8_t  bmAttributes; /**< Endpoint attributes, comprised of a mask of the endpoint type (EP_TYPE_*)  -									*   and attributes (ENDPOINT_ATTR_*) masks. -									*/ +			                        *   and attributes (ENDPOINT_ATTR_*) masks. +			                        */  			uint16_t wMaxPacketSize; /**< Size of the endpoint bank, in bytes. This indicates the maximum packet size -									  *   that the endpoint can receive at a time. -									  */ +			                          *   that the endpoint can receive at a time. +			                          */  			uint8_t  bInterval; /**< Polling interval in milliseconds for the endpoint if it is an INTERRUPT or -								 *   ISOCHRONOUS type. -								 */ -								  +			                     *   ISOCHRONOUS type. +			                     */ +			  			uint8_t  bRefresh; /**< Always set to zero for Audio class devices. */  			uint8_t  bSynchAddress; /**< Endpoint address to send synchronization information to, if needed (zero otherwise). */  		} USB_Audio_StdDescriptor_StreamEndpoint_Std_t; -					 +  		/** \brief Audio class-specific Extended Endpoint Descriptor (LUFA naming conventions).  		 *  		 *  Type define for an Audio class-specific extended endpoint descriptor. This contains extra information @@ -615,8 +615,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */		 diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h index 4c7abc106..59e262a22 100644 --- a/LUFA/Drivers/USB/Class/Common/HID.h +++ b/LUFA/Drivers/USB/Class/Common/HID.h @@ -155,7 +155,7 @@  		typedef struct  		{  			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */ -				 +			  			uint16_t                HIDSpec; /**< BCD encoded version that the HID descriptor and device complies to. */  			uint8_t                 CountryCode; /**< Country code of the localized device, or zero if universal. */ @@ -177,9 +177,9 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ -				 +			                           *   given by the specific class. +			                           */ +			  			uint16_t bcdHID; /**< BCD encoded version that the HID descriptor and device complies to. */  			uint8_t  bCountryCode; /**< Country code of the localized device, or zero if universal. */ diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h index 0c6223b5b..da7b2bd76 100644 --- a/LUFA/Drivers/USB/Class/Common/MIDI.h +++ b/LUFA/Drivers/USB/Class/Common/MIDI.h @@ -131,8 +131,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ @@ -171,8 +171,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ @@ -216,8 +216,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ @@ -261,8 +261,8 @@  		{  			uint8_t  bLength; /**< Size of the descriptor, in bytes. */  			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value -				                      *   given by the specific class. -				                      */ +			                           *   given by the specific class. +			                           */  			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */ diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h index 3e9d055e4..d71c1671f 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.h +++ b/LUFA/Drivers/USB/Class/Host/CDC.h @@ -334,7 +334,7 @@  				static uint8_t DCOMP_CDC_Host_NextCDCControlInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);  				static uint8_t DCOMP_CDC_Host_NextCDCDataInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);  				static uint8_t DCOMP_CDC_Host_NextCDCInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); -			#endif	 +			#endif  	#endif  	/* Disable C linkage for C++ Compilers: */ | 
