X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7dc3d3a68f889efeca5af51b22bd043eff8e0926..16f09ab50a6a931f0d8ec22a191288641e937eb1:/LUFA/Drivers/USB/Class/Common/Audio.h diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h index 70a8016c1..c838411f0 100644 --- a/LUFA/Drivers/USB/Class/Common/Audio.h +++ b/LUFA/Drivers/USB/Class/Common/Audio.h @@ -38,7 +38,7 @@ */ /** \ingroup Group_USBClassAudio - * @defgroup Group_USBClassAudioCommon Common Class Definitions + * \defgroup Group_USBClassAudioCommon Common Class Definitions * * \section Sec_ModDescription Module Description * Constants, Types and Enum definitions that are common to both Device and Host modes for the USB @@ -51,9 +51,7 @@ #define _AUDIO_CLASS_COMMON_H_ /* Includes: */ - #include "../../HighLevel/StdDescriptors.h" - - #include + #include "../../Core/StdDescriptors.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) @@ -297,7 +295,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_Audio_Descriptor_InputTerminal_t; + } ATTR_PACKED USB_Audio_Descriptor_InputTerminal_t; /** \brief Audio class-specific Input Terminal Descriptor (USB-IF naming conventions). * @@ -328,7 +326,7 @@ uint8_t iChannelNames; /**< Index of a string descriptor describing this channel within the device. */ uint8_t iTerminal; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_Audio_StdDescriptor_InputTerminal_t; + } ATTR_PACKED USB_Audio_StdDescriptor_InputTerminal_t; /** \brief Audio class-specific Output Terminal Descriptor (LUFA naming conventions). * @@ -353,7 +351,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_Audio_Descriptor_OutputTerminal_t; + } ATTR_PACKED USB_Audio_Descriptor_OutputTerminal_t; /** \brief Audio class-specific Output Terminal Descriptor (USB-IF naming conventions). * @@ -382,7 +380,7 @@ uint8_t bSourceID; /**< ID value of the unit this terminal's audio is sourced from. */ uint8_t iTerminal; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_Audio_StdDescriptor_OutputTerminal_t; + } ATTR_PACKED USB_Audio_StdDescriptor_OutputTerminal_t; /** \brief Audio class-specific Interface Descriptor (LUFA naming conventions). * @@ -404,7 +402,7 @@ uint8_t InCollection; /**< Total number of Audio Streaming interfaces linked to this Audio Control interface (must be 1). */ uint8_t InterfaceNumber; /**< Interface number of the associated Audio Streaming interface. */ - } USB_Audio_Descriptor_Interface_AC_t; + } ATTR_PACKED USB_Audio_Descriptor_Interface_AC_t; /** \brief Audio class-specific Interface Descriptor (USB-IF naming conventions). * @@ -431,7 +429,7 @@ uint8_t bInCollection; /**< Total number of Audio Streaming interfaces linked to this Audio Control interface (must be 1). */ uint8_t bInterfaceNumbers; /**< Interface number of the associated Audio Streaming interface. */ - } USB_Audio_StdDescriptor_Interface_AC_t; + } ATTR_PACKED USB_Audio_StdDescriptor_Interface_AC_t; /** \brief Audio class-specific Feature Unit Descriptor (LUFA naming conventions). * @@ -455,7 +453,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_Audio_Descriptor_FeatureUnit_t; + } ATTR_PACKED USB_Audio_Descriptor_FeatureUnit_t; /** \brief Audio class-specific Feature Unit Descriptor (USB-IF naming conventions). * @@ -484,7 +482,7 @@ uint8_t bmaControls[3]; /**< Feature masks for the control channel, and each separate audio channel. */ uint8_t iFeature; /**< Index of a string descriptor describing this descriptor within the device. */ - } USB_Audio_StdDescriptor_FeatureUnit_t; + } ATTR_PACKED USB_Audio_StdDescriptor_FeatureUnit_t; /** \brief Audio class-specific Streaming Audio Interface Descriptor (LUFA naming conventions). * @@ -504,7 +502,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_Audio_Descriptor_Interface_AS_t; + } ATTR_PACKED USB_Audio_Descriptor_Interface_AS_t; /** \brief Audio class-specific Streaming Audio Interface Descriptor (USB-IF naming conventions). * @@ -529,7 +527,7 @@ uint8_t bDelay; /**< Delay in frames resulting from the complete sample processing from input to output. */ uint16_t wFormatTag; /**< Format of the audio stream, see Audio Device Formats specification. */ - } USB_Audio_StdDescriptor_Interface_AS_t; + } ATTR_PACKED USB_Audio_StdDescriptor_Interface_AS_t; /** \brief 24-Bit Audio Frequency Structure. * @@ -541,7 +539,7 @@ uint8_t Byte1; /**< Lowest 8 bits of the 24-bit value. */ uint8_t Byte2; /**< Middle 8 bits of the 24-bit value. */ uint8_t Byte3; /**< Upper 8 bits of the 24-bit value. */ - } USB_Audio_SampleFreq_t; + } ATTR_PACKED USB_Audio_SampleFreq_t; /** \brief Audio class-specific Format Descriptor (LUFA naming conventions). * @@ -566,7 +564,7 @@ uint8_t SampleFrequencyType; /**< Total number of sample frequencies supported by the device. */ USB_Audio_SampleFreq_t SampleFrequencies[AUDIO_TOTAL_SAMPLE_RATES]; /**< Sample frequencies supported by the device (must be 24-bit). */ - } USB_Audio_Descriptor_Format_t; + } ATTR_PACKED USB_Audio_Descriptor_Format_t; /** \brief Audio class-specific Format Descriptor (USB-IF naming conventions). * @@ -596,7 +594,7 @@ uint8_t bSampleFrequencyType; /**< Total number of sample frequencies supported by the device. */ uint8_t SampleFrequencies[AUDIO_TOTAL_SAMPLE_RATES * 3]; /**< Sample frequencies supported by the device (must be 24-bit). */ - } USB_Audio_StdDescriptor_Format_t; + } ATTR_PACKED USB_Audio_StdDescriptor_Format_t; /** \brief Audio class-specific Streaming Endpoint Descriptor (LUFA naming conventions). * @@ -611,7 +609,7 @@ uint8_t Refresh; /**< Always set to zero for Audio class devices. */ uint8_t SyncEndpointNumber; /**< Endpoint address to send synchronization information to, if needed (zero otherwise). */ - } USB_Audio_Descriptor_StreamEndpoint_Std_t; + } ATTR_PACKED USB_Audio_Descriptor_StreamEndpoint_Std_t; /** \brief Audio class-specific Streaming Endpoint Descriptor (USB-IF naming conventions). * @@ -642,7 +640,7 @@ 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; + } ATTR_PACKED USB_Audio_StdDescriptor_StreamEndpoint_Std_t; /** \brief Audio class-specific Extended Endpoint Descriptor (LUFA naming conventions). * @@ -663,7 +661,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_Audio_Descriptor_StreamEndpoint_Spc_t; + } ATTR_PACKED USB_Audio_Descriptor_StreamEndpoint_Spc_t; /** \brief Audio class-specific Extended Endpoint Descriptor (USB-IF naming conventions). * @@ -689,7 +687,7 @@ uint8_t bLockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification. */ uint16_t wLockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry. */ - } USB_Audio_StdDescriptor_StreamEndpoint_Spc_t; + } ATTR_PACKED USB_Audio_StdDescriptor_StreamEndpoint_Spc_t; /* Disable C linkage for C++ Compilers: */ #if defined(__cplusplus)