diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-09 13:05:57 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-09 13:05:57 +0000 |
| commit | c166dfc64ea10903a43a429709a92dc7ef9ee9dc (patch) | |
| tree | 94cd423adcc362137d3f1e178f29d5db0f537122 /Demos/Device/ClassDriver/AudioInput/Descriptors.c | |
| parent | 66f14d44a3c3f1744e85cea14061b568c3c1306c (diff) | |
| download | lufa-c166dfc64ea10903a43a429709a92dc7ef9ee9dc.tar.gz lufa-c166dfc64ea10903a43a429709a92dc7ef9ee9dc.tar.bz2 lufa-c166dfc64ea10903a43a429709a92dc7ef9ee9dc.zip | |
Added class specific descriptor type defines with standard USB-IF element naming.
Diffstat (limited to 'Demos/Device/ClassDriver/AudioInput/Descriptors.c')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioInput/Descriptors.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c index f1cb72df2..ba8c00182 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c @@ -104,13 +104,13 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Audio_ControlInterface_SPC = { - .Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_AudioInterface}, .Subtype = DSUBTYPE_Header, .ACSpecification = VERSION_BCD(01.00), - .TotalLength = (sizeof(USB_Audio_Interface_AC_t) + - sizeof(USB_Audio_InputTerminal_t) + - sizeof(USB_Audio_OutputTerminal_t)), + .TotalLength = (sizeof(USB_Audio_Descriptor_Interface_AC_t) + + sizeof(USB_Audio_Descriptor_InputTerminal_t) + + sizeof(USB_Audio_Descriptor_OutputTerminal_t)), .InCollection = 1, .InterfaceNumbers = {1}, @@ -118,7 +118,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Audio_InputTerminal = { - .Header = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_InputTerminal_t), .Type = DTYPE_AudioInterface}, .Subtype = DSUBTYPE_InputTerminal, .TerminalID = 0x01, @@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Audio_OutputTerminal = { - .Header = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_OutputTerminal_t), .Type = DTYPE_AudioInterface}, .Subtype = DSUBTYPE_OutputTerminal, .TerminalID = 0x02, @@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Audio_StreamInterface_SPC = { - .Header = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_Interface_AS_t), .Type = DTYPE_AudioInterface}, .Subtype = DSUBTYPE_General, .TerminalLink = 0x02, @@ -191,7 +191,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Audio_AudioFormat = { - .Header = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_Format_t), .Type = DTYPE_AudioInterface}, .Subtype = DSUBTYPE_Format, .FormatType = 0x01, @@ -208,7 +208,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { .Endpoint = { - .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM), .Attributes = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA), @@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Audio_StreamEndpoint_SPC = { - .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint}, + .Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint}, .Subtype = DSUBTYPE_General, .Attributes = 0x00, |