From c0e4f52e8fecf74bc26ba813522aa96300bb844e Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 28 Sep 2010 14:59:16 +0000 Subject: Fix up incorrect version numbers in demo/project descriptors. Add class name prefixes to missed constants in the class drivers to give all class driver elements a consistent namespace. --- Demos/Device/ClassDriver/AudioInput/Descriptors.c | 6 +++--- Demos/Device/ClassDriver/AudioOutput/Descriptors.c | 8 ++++---- Demos/Device/Incomplete/Sideshow/Descriptors.c | 2 +- Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c | 2 +- Demos/Device/LowLevel/AudioInput/Descriptors.c | 4 ++-- Demos/Device/LowLevel/AudioOutput/Descriptors.c | 2 +- Demos/Device/LowLevel/MIDI/Descriptors.c | 2 +- Demos/Device/LowLevel/MIDI/Descriptors.h | 2 +- Demos/Device/LowLevel/Mouse/Descriptors.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'Demos') diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c index 991b33e30..b89c97f73 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c @@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal, .TerminalID = 0x01, - .TerminalType = TERMINAL_IN_MIC, + .TerminalType = AUDIO_TERMINAL_IN_MIC, .AssociatedOutputTerminal = 0x00, .TotalChannels = 1, @@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal, .TerminalID = 0x02, - .TerminalType = TERMINAL_STREAMING, + .TerminalType = AUDIO_TERMINAL_STREAMING, .AssociatedInputTerminal = 0x00, .SourceID = 0x01, @@ -225,7 +225,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Spc_t), .Type = DTYPE_CSEndpoint}, .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General, - .Attributes = 0x00, + .Attributes = AUDIO_EP_ACCEPTS_SMALL_PACKETS, .LockDelayUnits = 0x00, .LockDelay = 0x0000 diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c index 57668f2df..7db75609d 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c @@ -122,11 +122,11 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal, .TerminalID = 0x01, - .TerminalType = TERMINAL_STREAMING, + .TerminalType = AUDIO_TERMINAL_STREAMING, .AssociatedOutputTerminal = 0x00, .TotalChannels = 2, - .ChannelConfig = (CHANNEL_LEFT_FRONT | CHANNEL_RIGHT_FRONT), + .ChannelConfig = (AUDIO_CHANNEL_LEFT_FRONT | AUDIO_CHANNEL_RIGHT_FRONT), .ChannelStrIndex = NO_DESCRIPTOR, .TerminalStrIndex = NO_DESCRIPTOR @@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal, .TerminalID = 0x02, - .TerminalType = TERMINAL_OUT_SPEAKER, + .TerminalType = AUDIO_TERMINAL_OUT_SPEAKER, .AssociatedInputTerminal = 0x00, .SourceID = 0x01, @@ -225,7 +225,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Spc_t), .Type = DTYPE_CSEndpoint}, .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General, - .Attributes = EP_ACCEPTS_SMALL_PACKETS, + .Attributes = AUDIO_EP_ACCEPTS_SMALL_PACKETS, .LockDelayUnits = 0x00, .LockDelay = 0x0000 diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c index 8f4c7c532..4e3983c22 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.c +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c @@ -34,7 +34,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { Header: {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device}, - USBSpecification: VERSION_BCD(02.00), + USBSpecification: VERSION_BCD(01.10), Class: 0x00, SubClass: 0x00, Protocol: 0x00, diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c index 53c6a0193..0cb7852ab 100644 --- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c +++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c @@ -59,7 +59,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - .USBSpecification = VERSION_BCD(02.00), + .USBSpecification = VERSION_BCD(01.10), .Class = 0x00, .SubClass = 0x00, .Protocol = 0x00, diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.c b/Demos/Device/LowLevel/AudioInput/Descriptors.c index 307439611..ddcac155a 100644 --- a/Demos/Device/LowLevel/AudioInput/Descriptors.c +++ b/Demos/Device/LowLevel/AudioInput/Descriptors.c @@ -46,7 +46,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - .USBSpecification = VERSION_BCD(02.00), + .USBSpecification = VERSION_BCD(01.10), .Class = 0x00, .SubClass = 0x00, .Protocol = 0x00, @@ -226,7 +226,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_CSEndpoint}, .Subtype = DSUBTYPE_General, - .Attributes = 0x00, + .Attributes = EP_ACCEPTS_SMALL_PACKETS, .LockDelayUnits = 0x00, .LockDelay = 0x0000 diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.c b/Demos/Device/LowLevel/AudioOutput/Descriptors.c index 2d749fcd3..d6e8ef632 100644 --- a/Demos/Device/LowLevel/AudioOutput/Descriptors.c +++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.c @@ -46,7 +46,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - .USBSpecification = VERSION_BCD(02.00), + .USBSpecification = VERSION_BCD(01.10), .Class = 0x00, .SubClass = 0x00, .Protocol = 0x00, diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.c b/Demos/Device/LowLevel/MIDI/Descriptors.c index af52cba43..2d2b365aa 100644 --- a/Demos/Device/LowLevel/MIDI/Descriptors.c +++ b/Demos/Device/LowLevel/MIDI/Descriptors.c @@ -107,7 +107,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Header = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_CSInterface}, .Subtype = DSUBTYPE_AudioHeader, - .ACSpecification = VERSION_BCD(01.00), + .AudioSpecification = VERSION_BCD(01.00), .TotalLength = sizeof(USB_Audio_Interface_AC_t), .InCollection = 1, diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h index 5aebd8fdb..b364c1b62 100644 --- a/Demos/Device/LowLevel/MIDI/Descriptors.h +++ b/Demos/Device/LowLevel/MIDI/Descriptors.h @@ -79,7 +79,7 @@ USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length */ uint8_t Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */ - uint16_t ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */ + uint16_t AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */ uint16_t TotalLength; /**< Total length of the Audio class specific control descriptors, including this descriptor */ uint8_t InCollection; /**< Total number of audio class interfaces within this device */ diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.c b/Demos/Device/LowLevel/Mouse/Descriptors.c index 70538fe5c..f85ff61eb 100644 --- a/Demos/Device/LowLevel/Mouse/Descriptors.c +++ b/Demos/Device/LowLevel/Mouse/Descriptors.c @@ -82,7 +82,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - .USBSpecification = VERSION_BCD(02.00), + .USBSpecification = VERSION_BCD(01.10), .Class = 0x00, .SubClass = 0x00, .Protocol = 0x00, -- cgit v1.2.3