Reduce struct name pollution - group typedef struct names by class driver name where appropriate.

5 files changed, 29 insertions, 22 deletions

diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h
index 07667a5e1..a55fd0d7c 100644
--- a/LUFA/Drivers/USB/Class/Common/Audio.h
+++ b/LUFA/Drivers/USB/Class/Common/Audio.h
@@ -46,6 +46,13 @@
 		#endif

 

 	/* Macros: */

+		#if !defined(AUDIO_TOTAL_SAMPLE_RATES) || defined(__DOXYGEN__)

+			/** Total number of discrete audio sample rates supported by the device. This value can be overridden by defining this

+			 *  token in the project makefile to the desired value, and passing it to the compiler via the -D switch.

+			 */

+			#define AUDIO_TOTAL_SAMPLE_RATES    1

+		#endif

+		

 		/** Descriptor header constant to indicate a Audio class interface descriptor. */

 		#define DTYPE_AudioInterface         0x24

 

@@ -223,7 +230,7 @@
 			

 			uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */

 			uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */

-		} USB_AudioInterface_AC_t;

+		} USB_Audio_Interface_AC_t;

 		

 		/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features

 		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio

@@ -241,7 +248,7 @@
 			uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */

 			

 			uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioFeatureUnit_t;

+		} USB_Audio_FeatureUnit_t;

 

 		/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device

 		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,

@@ -262,7 +269,7 @@
 			

 			uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */

 			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioInputTerminal_t;

+		} USB_Audio_InputTerminal_t;

 

 		/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device

 		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,

@@ -281,7 +288,7 @@
 			uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */

 			

 			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */

-		} USB_AudioOutputTerminal_t;

+		} USB_Audio_OutputTerminal_t;

 		

 		/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host

 		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.

@@ -295,7 +302,7 @@
 			

 			uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */

 			uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */

-		} USB_AudioInterface_AS_t;

+		} USB_Audio_Interface_AS_t;

 		

 		/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,

 		 *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.

@@ -304,7 +311,7 @@
 		{

 			uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */

 			uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */

-		} AudioSampleFreq_t;

+		} USB_Audio_SampleFreq_t;

 

 		/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details

 		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used

@@ -322,8 +329,8 @@
 			uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */

 

 			uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */			

-			AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */

-		} USB_AudioFormat_t;

+			USB_Audio_SampleFreq_t    SampleFrequencies[AUDIO_TOTAL_SAMPLE_RATES]; /**< Sample frequencies supported by the device */

+		} USB_Audio_Format_t;

 		

 		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 

 		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.

@@ -334,7 +341,7 @@
 

 			uint8_t                   Refresh; /**< Always set to zero */

 			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */

-		} USB_AudioStreamEndpoint_Std_t;

+		} USB_Audio_StreamEndpoint_Std_t;

 					

 		/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information

 		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio

@@ -349,7 +356,7 @@
 

 			uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */

 			uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */

-		} USB_AudioStreamEndpoint_Spc_t;

+		} USB_Audio_StreamEndpoint_Spc_t;

 

 	/* Disable C linkage for C++ Compilers: */

 		#if defined(__cplusplus)

diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h
index 54403d4c8..9179f6af0 100644
--- a/LUFA/Drivers/USB/Class/Common/HID.h
+++ b/LUFA/Drivers/USB/Class/Common/HID.h
@@ -80,7 +80,7 @@
 

 			uint8_t                  HIDReportType;

 			uint16_t                 HIDReportLength;

-		} USB_Descriptor_HID_t;

+		} USB_HID_Descriptor_t;

 

 		/** Type define for the data type used to store HID report descriptor elements. */

 		typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;

diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h
index fad7ad89d..dfeadb05b 100644
--- a/LUFA/Drivers/USB/Class/Common/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Common/MIDI.h
@@ -87,7 +87,7 @@
 			

 			uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */

 			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */

-		} USB_AudioInterface_MIDI_AS_t;

+		} USB_MIDI_AudioInterface_AS_t;

 		

 		/** Type define for an Audio class specific MIDI IN jack. This gives information to the host on a MIDI input, either

 		 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).

@@ -143,7 +143,7 @@
 			uint8_t Data1; /**< First byte of data in the MIDI event */

 			uint8_t Data2; /**< Second byte of data in the MIDI event */

 			uint8_t Data3; /**< Third byte of data in the MIDI event */		

-		} USB_MIDI_EventPacket_t;

+		} MIDI_EventPacket_t;

 

 	/* Disable C linkage for C++ Compilers: */

 		#if defined(__cplusplus)

diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
index d00f371a0..f7e4df361 100644
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -75,7 +75,7 @@
 			uint8_t  LUN; /**< Logical Unit number this command is issued to */

 			uint8_t  SCSICommandLength; /**< Length of the issued SCSI command within the SCSI command data array */

 			uint8_t  SCSICommandData[16]; /**< Issued SCSI command in the Command Block */

-		} CommandBlockWrapper_t;

+		} MS_CommandBlockWrapper_t;

 		

 		/** Type define for a Command Status Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */

 		typedef struct

@@ -84,7 +84,7 @@
 			uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper */

 			uint32_t DataTransferResidue; /**< Number of bytes of data not processed in the SCSI command */

 			uint8_t  Status; /**< Status code of the issued command - a value from the MassStorage_CommandStatusCodes_t enum */

-		} CommandStatusWrapper_t;

+		} MS_CommandStatusWrapper_t;

 		

 	/* Enums: */

 		/** Enum for the possible command status wrapper return status codes. */

diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h
index c169fa448..5c875b7de 100644
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -93,13 +93,6 @@
 			uint8_t       Octets[6]; /**< Individual bytes of a MAC address */

 		} MAC_Address_t;

 

-		/** Type define for a RNDIS message header, sent before RNDIS messages */

-		typedef struct

-		{

-			uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */

-			uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */

-		} RNDIS_Message_Header_t;

-

 		/** Type define for an Ethernet frame buffer. */

 		typedef struct

 		{

@@ -108,6 +101,13 @@
 			bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer */

 		} Ethernet_Frame_Info_t;

 

+		/** Type define for a RNDIS message header, sent before RNDIS messages */

+		typedef struct

+		{

+			uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */

+			uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */

+		} RNDIS_Message_Header_t;

+

 		/** Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter */

 		typedef struct

 		{