forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Altered the definition of the USB_Audio_Descriptor_Format_t descriptor so that the user is now responsible for supplying the supported audio sampling rates, to allow for multiple audio interfaces with different numbers of supported rates and/or continuous sample rates.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 78cfaac9b4
commit 2a26efc691
15 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File

7
Demos/Device/ClassDriver/AudioInput/Descriptors.c
Unescape View File

@ -199,9 +199,12 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.SubFrameSize = 0x02, .SubFrameSize = 0x02,
.BitResolution = 16, .BitResolution = 16,
.SampleFrequencyType = AUDIO_TOTAL_SAMPLE_RATES, .TotalDiscreteSampleRates = 1,
},
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)} .Audio_AudioFormatSampleRates =
{
AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)
}, },
.Audio_StreamEndpoint = .Audio_StreamEndpoint =

1
Demos/Device/ClassDriver/AudioInput/Descriptors.h
Unescape View File

@ -70,6 +70,7 @@
USB_Descriptor_Interface_t Audio_StreamInterface_Alt1; USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;
USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC; USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC;
USB_Audio_Descriptor_Format_t Audio_AudioFormat; USB_Audio_Descriptor_Format_t Audio_AudioFormat;
USB_Audio_SampleFreq_t Audio_AudioFormatSampleRates[1];
USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint; USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint;
USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC; USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;
} USB_Descriptor_Configuration_t; } USB_Descriptor_Configuration_t;

8
Demos/Device/ClassDriver/AudioOutput/Descriptors.c
Unescape View File

@ -200,8 +200,12 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.SubFrameSize = 0x02, .SubFrameSize = 0x02,
.BitResolution = 16, .BitResolution = 16,
.SampleFrequencyType = AUDIO_TOTAL_SAMPLE_RATES, .TotalDiscreteSampleRates = 1,
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)} },
.Audio_AudioFormatSampleRates =
{
AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)
}, },
.Audio_StreamEndpoint = .Audio_StreamEndpoint =

1
Demos/Device/ClassDriver/AudioOutput/Descriptors.h
Unescape View File

@ -70,6 +70,7 @@
USB_Descriptor_Interface_t Audio_StreamInterface_Alt1; USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;
USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC; USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC;
USB_Audio_Descriptor_Format_t Audio_AudioFormat; USB_Audio_Descriptor_Format_t Audio_AudioFormat;
USB_Audio_SampleFreq_t Audio_AudioFormatSampleRates[1];
USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint; USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint;
USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC; USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;
} USB_Descriptor_Configuration_t; } USB_Descriptor_Configuration_t;

7
Demos/Device/LowLevel/AudioInput/Descriptors.c
Unescape View File

@ -199,9 +199,12 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.SubFrameSize = 0x02, .SubFrameSize = 0x02,
.BitResolution = 16, .BitResolution = 16,
.SampleFrequencyType = AUDIO_TOTAL_SAMPLE_RATES, .TotalDiscreteSampleRates = 1,
},
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)} .Audio_AudioFormatSampleRates =
{
AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)
}, },
.Audio_StreamEndpoint = .Audio_StreamEndpoint =

1
Demos/Device/LowLevel/AudioInput/Descriptors.h
Unescape View File

@ -70,6 +70,7 @@
USB_Descriptor_Interface_t Audio_StreamInterface_Alt1; USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;
USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC; USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC;
USB_Audio_Descriptor_Format_t Audio_AudioFormat; USB_Audio_Descriptor_Format_t Audio_AudioFormat;
USB_Audio_SampleFreq_t Audio_AudioFormatSampleRates[1];
USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint; USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint;
USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC; USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;
} USB_Descriptor_Configuration_t; } USB_Descriptor_Configuration_t;

8
Demos/Device/LowLevel/AudioOutput/Descriptors.c
Unescape View File

@ -200,8 +200,12 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.SubFrameSize = 0x02, .SubFrameSize = 0x02,
.BitResolution = 16, .BitResolution = 16,
.SampleFrequencyType = AUDIO_TOTAL_SAMPLE_RATES, .TotalDiscreteSampleRates = 1,
.SampleFrequencies = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)} },
.Audio_AudioFormatSampleRates =
{
AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)
}, },
.Audio_StreamEndpoint = .Audio_StreamEndpoint =

1
Demos/Device/LowLevel/AudioOutput/Descriptors.h
Unescape View File

@ -70,6 +70,7 @@
USB_Descriptor_Interface_t Audio_StreamInterface_Alt1; USB_Descriptor_Interface_t Audio_StreamInterface_Alt1;
USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC; USB_Audio_Descriptor_Interface_AS_t Audio_StreamInterface_SPC;
USB_Audio_Descriptor_Format_t Audio_AudioFormat; USB_Audio_Descriptor_Format_t Audio_AudioFormat;
USB_Audio_SampleFreq_t Audio_AudioFormatSampleRates[1];
USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint; USB_Audio_Descriptor_StreamEndpoint_Std_t Audio_StreamEndpoint;
USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC; USB_Audio_Descriptor_StreamEndpoint_Spc_t Audio_StreamEndpoint_SPC;
} USB_Descriptor_Configuration_t; } USB_Descriptor_Configuration_t;

27
LUFA/Drivers/USB/Class/Common/Audio.h
Unescape View File

@ -64,13 +64,6 @@
#endif #endif
/* Macros: */ /* 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
/** \name Audio Channel Masks */ /** \name Audio Channel Masks */
//@{ //@{
/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */ /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
@ -563,6 +556,9 @@
* about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used * about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
* in the device's audio streams. See the USB Audio specification for more details. * in the device's audio streams. See the USB Audio specification for more details.
* *
* \note This descriptor <b>must</b> be followed by one or more \ref USB_Audio_SampleFreq_t elements containing
* the continuous or discrete sample frequencies.
*
* \see \ref USB_Audio_StdDescriptor_Format_t for the version of this type with standard element names. * \see \ref USB_Audio_StdDescriptor_Format_t for the version of this type with standard element names.
*/ */
typedef struct typedef struct
@ -578,8 +574,11 @@
uint8_t SubFrameSize; /**< Size in bytes of each channel's sample data in the stream. */ uint8_t SubFrameSize; /**< Size in bytes of each channel's sample data in the stream. */
uint8_t BitResolution; /**< Bits of resolution of each channel's samples in the stream. */ 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. */ uint8_t TotalDiscreteSampleRates; /**< Total number of discrete sample frequencies supported by the device. When
USB_Audio_SampleFreq_t SampleFrequencies[AUDIO_TOTAL_SAMPLE_RATES]; /**< Sample frequencies supported by the device (must be 24-bit). */ * zero, this must be followed by the lower and upper continuous sampling
* frequencies supported by the device; otherwise, this must be followed
* by the given number of discrete sampling frequencies supported.
*/
} ATTR_PACKED USB_Audio_Descriptor_Format_t; } ATTR_PACKED USB_Audio_Descriptor_Format_t;
/** \brief Audio class-specific Format Descriptor (USB-IF naming conventions). /** \brief Audio class-specific Format Descriptor (USB-IF naming conventions).
@ -588,6 +587,9 @@
* about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used * about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
* in the device's audio streams. See the USB Audio specification for more details. * in the device's audio streams. See the USB Audio specification for more details.
* *
* \note This descriptor <b>must</b> be followed by one or more 24-bit integer elements containing the continuous
* or discrete sample frequencies.
*
* \see \ref USB_Audio_Descriptor_Format_t for the version of this type with non-standard LUFA specific * \see \ref USB_Audio_Descriptor_Format_t for the version of this type with non-standard LUFA specific
* element names. * element names.
*/ */
@ -608,8 +610,11 @@
uint8_t bSubFrameSize; /**< Size in bytes of each channel's sample data in the stream. */ uint8_t bSubFrameSize; /**< Size in bytes of each channel's sample data in the stream. */
uint8_t bBitResolution; /**< Bits of resolution of each channel's samples in the stream. */ uint8_t bBitResolution; /**< Bits of resolution of each channel's samples in the stream. */
uint8_t bSampleFrequencyType; /**< Total number of sample frequencies supported by the device. */ uint8_t bSampleFrequencyType; /**< Total number of sample frequencies supported by the device. When
uint8_t SampleFrequencies[AUDIO_TOTAL_SAMPLE_RATES * 3]; /**< Sample frequencies supported by the device (must be 24-bit). */ * zero, this must be followed by the lower and upper continuous sampling
* frequencies supported by the device; otherwise, this must be followed
* by the given number of discrete sampling frequencies supported.
*/
} ATTR_PACKED USB_Audio_StdDescriptor_Format_t; } ATTR_PACKED USB_Audio_StdDescriptor_Format_t;
/** \brief Audio class-specific Streaming Endpoint Descriptor (LUFA naming conventions). /** \brief Audio class-specific Streaming Endpoint Descriptor (LUFA naming conventions).

4
LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
Unescape View File

@ -351,7 +351,7 @@ uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointNum)
return USB_Host_SendControlRequest(NULL); return USB_Host_SendControlRequest(NULL);
} }
uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceNum, uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,
const uint8_t AltSetting) const uint8_t AltSetting)
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
@ -359,7 +359,7 @@ uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceNum,
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE),
.bRequest = REQ_SetInterface, .bRequest = REQ_SetInterface,
.wValue = AltSetting, .wValue = AltSetting,
.wIndex = InterfaceNum, .wIndex = InterfaceIndex,
.wLength = 0, .wLength = 0,
}; };

2
LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h
Unescape View File

@ -340,7 +340,7 @@
* *
* \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
*/ */
uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceNum, uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,
const uint8_t AltSetting); const uint8_t AltSetting);
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */

4
LUFA/Drivers/USB/Core/UC3/Host_UC3.c
Unescape View File

@ -351,7 +351,7 @@ uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointNum)
return USB_Host_SendControlRequest(NULL); return USB_Host_SendControlRequest(NULL);
} }
uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceNum, uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,
const uint8_t AltSetting) const uint8_t AltSetting)
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
@ -359,7 +359,7 @@ uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceNum,
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE),
.bRequest = REQ_SetInterface, .bRequest = REQ_SetInterface,
.wValue = AltSetting, .wValue = AltSetting,
.wIndex = InterfaceNum, .wIndex = InterfaceIndex,
.wLength = 0, .wLength = 0,
}; };

2
LUFA/Drivers/USB/Core/UC3/Host_UC3.h
Unescape View File

@ -341,7 +341,7 @@
* *
* \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
*/ */
uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceNum, uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,
const uint8_t AltSetting); const uint8_t AltSetting);
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */

3
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -22,6 +22,9 @@
* <b>Changed:</b> * <b>Changed:</b>
* - Core: * - Core:
* - Added support for the Audio class GET STATUS request so that it is correctly ACKed when sent by the host * - Added support for the Audio class GET STATUS request so that it is correctly ACKed when sent by the host
* - Altered the definition of the USB_Audio_Descriptor_Format_t descriptor so that the user is now responsible for supplying
* the supported audio sampling rates, to allow for multiple audio interfaces with different numbers of supported rates and/or
* continuous sample rates
* - Library Applications: * - Library Applications:
* - <i>None</i> * - <i>None</i>
* *

7
LUFA/ManPages/MigrationInformation.txt
Unescape View File

@ -11,7 +11,12 @@
* areas relevant to making older projects compatible with the API changes of each new release. * areas relevant to making older projects compatible with the API changes of each new release.
* *
* \section Sec_MigrationXXXXXX Migrating from 110528 to XXXXXX * \section Sec_MigrationXXXXXX Migrating from 110528 to XXXXXX
* <i>None</i> * <b>Device Mode</b>
* - The definition of the Audio class \ref USB_Audio_Descriptor_Format_t has been altered, to remove the fixed singular
* audio sample rate in the descriptor definition, and to rename the \c SampleFrequencyType to the more appropriate
* \c TotalDiscreteSampleRates. Existing applications will need to add an array of \ref USB_Audio_SampleFreq_t elements
* immediately following any \ref USB_Audio_Descriptor_Format_t descriptors, and insert the appropriate sampling rates
* supported by the device, as well as rename the descriptor elements to match the updated element names.
* *
* \section Sec_Migration110528 Migrating from 101122 to 110528 * \section Sec_Migration110528 Migrating from 101122 to 110528
* <b>Non-USB Library Components</b> * <b>Non-USB Library Components</b>

Write Preview
Loading…
Cancel
Save