X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6933f2e1a543b066ebe734bd126a7ff2f1c2777f..526e398986583e2fb65c0a36a2fbf2ce153446e5:/Demos/Device/AudioInput/Descriptors.c diff --git a/Demos/Device/AudioInput/Descriptors.c b/Demos/Device/AudioInput/Descriptors.c index 95b2906e8..f15757ef6 100644 --- a/Demos/Device/AudioInput/Descriptors.c +++ b/Demos/Device/AudioInput/Descriptors.c @@ -44,24 +44,24 @@ */ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { - Header: {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device}, + .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - USBSpecification: VERSION_BCD(02.00), - Class: 0x00, - SubClass: 0x00, - Protocol: 0x00, + .USBSpecification = VERSION_BCD(02.00), + .Class = 0x00, + .SubClass = 0x00, + .Protocol = 0x00, - Endpoint0Size: 8, + .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, - VendorID: 0x03EB, - ProductID: 0x2047, - ReleaseNumber: 0x0000, + .VendorID = 0x03EB, + .ProductID = 0x2047, + .ReleaseNumber = 0x0000, - ManufacturerStrIndex: 0x01, - ProductStrIndex: 0x02, - SerialNumStrIndex: NO_DESCRIPTOR, + .ManufacturerStrIndex = 0x01, + .ProductStrIndex = 0x02, + .SerialNumStrIndex = NO_DESCRIPTOR, - NumberOfConfigurations: 1 + .NumberOfConfigurations = 1 }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage @@ -71,164 +71,164 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = */ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { - Config: + .Config = { - Header: {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration}, + .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration}, - TotalConfigurationSize: sizeof(USB_Descriptor_Configuration_t), - TotalInterfaces: 2, + .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), + .TotalInterfaces = 2, - ConfigurationNumber: 1, - ConfigurationStrIndex: NO_DESCRIPTOR, + .ConfigurationNumber = 1, + .ConfigurationStrIndex = NO_DESCRIPTOR, - ConfigAttributes: (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED), + .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED), - MaxPowerConsumption: USB_CONFIG_POWER_MA(100) + .MaxPowerConsumption = USB_CONFIG_POWER_MA(100) }, - AudioControlInterface: + .AudioControlInterface = { - Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface}, + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - InterfaceNumber: 0, - AlternateSetting: 0, + .InterfaceNumber = 0, + .AlternateSetting = 0, - TotalEndpoints: 0, + .TotalEndpoints = 0, - Class: 0x01, - SubClass: 0x01, - Protocol: 0x00, + .Class = 0x01, + .SubClass = 0x01, + .Protocol = 0x00, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, - AudioControlInterface_SPC: + .AudioControlInterface_SPC = { - Header: {Size: sizeof(USB_AudioInterface_AC_t), Type: DTYPE_AudioInterface}, - Subtype: DSUBTYPE_Header, + .Header = {.Size = sizeof(USB_AudioInterface_AC_t), .Type = DTYPE_AudioInterface}, + .Subtype = DSUBTYPE_Header, - ACSpecification: VERSION_BCD(01.00), - TotalLength: (sizeof(USB_AudioInterface_AC_t) + - sizeof(USB_AudioInputTerminal_t) + - sizeof(USB_AudioOutputTerminal_t)), + .ACSpecification = VERSION_BCD(01.00), + .TotalLength = (sizeof(USB_AudioInterface_AC_t) + + sizeof(USB_AudioInputTerminal_t) + + sizeof(USB_AudioOutputTerminal_t)), - InCollection: 1, - InterfaceNumbers: {1}, + .InCollection = 1, + .InterfaceNumbers = {1}, }, - InputTerminal: + .InputTerminal = { - Header: {Size: sizeof(USB_AudioInputTerminal_t), Type: DTYPE_AudioInterface}, - Subtype: DSUBTYPE_InputTerminal, + .Header = {.Size = sizeof(USB_AudioInputTerminal_t), .Type = DTYPE_AudioInterface}, + .Subtype = DSUBTYPE_InputTerminal, - TerminalID: 0x01, - TerminalType: TERMINAL_IN_MIC, - AssociatedOutputTerminal: 0x00, + .TerminalID = 0x01, + .TerminalType = TERMINAL_IN_MIC, + .AssociatedOutputTerminal = 0x00, - TotalChannels: 1, - ChannelConfig: 0, + .TotalChannels = 1, + .ChannelConfig = 0, - ChannelStrIndex: NO_DESCRIPTOR, - TerminalStrIndex: NO_DESCRIPTOR + .ChannelStrIndex = NO_DESCRIPTOR, + .TerminalStrIndex = NO_DESCRIPTOR }, - OutputTerminal: + .OutputTerminal = { - Header: {Size: sizeof(USB_AudioOutputTerminal_t), Type: DTYPE_AudioInterface}, - Subtype: DSUBTYPE_OutputTerminal, + .Header = {.Size = sizeof(USB_AudioOutputTerminal_t), .Type = DTYPE_AudioInterface}, + .Subtype = DSUBTYPE_OutputTerminal, - TerminalID: 0x02, - TerminalType: TERMINAL_STREAMING, - AssociatedInputTerminal: 0x00, + .TerminalID = 0x02, + .TerminalType = TERMINAL_STREAMING, + .AssociatedInputTerminal = 0x00, - SourceID: 0x01, + .SourceID = 0x01, - TerminalStrIndex: NO_DESCRIPTOR + .TerminalStrIndex = NO_DESCRIPTOR }, - AudioStreamInterface_Alt0: + .AudioStreamInterface_Alt0 = { - Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface}, + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - InterfaceNumber: 1, - AlternateSetting: 0, + .InterfaceNumber = 1, + .AlternateSetting = 0, - TotalEndpoints: 0, + .TotalEndpoints = 0, - Class: 0x01, - SubClass: 0x02, - Protocol: 0x00, + .Class = 0x01, + .SubClass = 0x02, + .Protocol = 0x00, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, - AudioStreamInterface_Alt1: + .AudioStreamInterface_Alt1 = { - Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface}, + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - InterfaceNumber: 1, - AlternateSetting: 1, + .InterfaceNumber = 1, + .AlternateSetting = 1, - TotalEndpoints: 1, + .TotalEndpoints = 1, - Class: 0x01, - SubClass: 0x02, - Protocol: 0x00, + .Class = 0x01, + .SubClass = 0x02, + .Protocol = 0x00, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, - AudioStreamInterface_SPC: + .AudioStreamInterface_SPC = { - Header: {Size: sizeof(USB_AudioInterface_AS_t), Type: DTYPE_AudioInterface}, - Subtype: DSUBTYPE_General, + .Header = {.Size = sizeof(USB_AudioInterface_AS_t), .Type = DTYPE_AudioInterface}, + .Subtype = DSUBTYPE_General, - TerminalLink: 0x02, + .TerminalLink = 0x02, - FrameDelay: 1, - AudioFormat: 0x0001 + .FrameDelay = 1, + .AudioFormat = 0x0001 }, - AudioFormat: + .AudioFormat = { - Header: {Size: sizeof(USB_AudioFormat_t), Type: DTYPE_AudioInterface}, - Subtype: DSUBTYPE_Format, + .Header = {.Size = sizeof(USB_AudioFormat_t), .Type = DTYPE_AudioInterface}, + .Subtype = DSUBTYPE_Format, - FormatType: 0x01, - Channels: 0x01, + .FormatType = 0x01, + .Channels = 0x01, - SubFrameSize: 0x02, - BitResolution: 16, - SampleFrequencyType: (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)), + .SubFrameSize = 0x02, + .BitResolution = 16, + .SampleFrequencyType = (sizeof(ConfigurationDescriptor.AudioFormat.SampleFrequencies) / sizeof(AudioSampleFreq_t)), - SampleFrequencies: {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)} + .SampleFrequencies = {SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)} }, - AudioEndpoint: + .AudioEndpoint = { - Endpoint: + .Endpoint = { - Header: {Size: sizeof(USB_AudioStreamEndpoint_Std_t), Type: DTYPE_Endpoint}, + .Header = {.Size = sizeof(USB_AudioStreamEndpoint_Std_t), .Type = DTYPE_Endpoint}, - EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM), - Attributes: (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA), - EndpointSize: AUDIO_STREAM_EPSIZE, - PollingIntervalMS: 1 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | AUDIO_STREAM_EPNUM), + .Attributes = (EP_TYPE_ISOCHRONOUS | ENDPOINT_ATTR_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = AUDIO_STREAM_EPSIZE, + .PollingIntervalMS = 1 }, - Refresh: 0, - SyncEndpointNumber: 0 + .Refresh = 0, + .SyncEndpointNumber = 0 }, - AudioEndpoint_SPC: + .AudioEndpoint_SPC = { - Header: {Size: sizeof(USB_AudioStreamEndpoint_Spc_t), Type: DTYPE_AudioEndpoint}, - Subtype: DSUBTYPE_General, + .Header = {.Size = sizeof(USB_AudioStreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint}, + .Subtype = DSUBTYPE_General, - Attributes: 0x00, + .Attributes = 0x00, - LockDelayUnits: 0x00, - LockDelay: 0x0000 + .LockDelayUnits = 0x00, + .LockDelay = 0x0000 } }; @@ -238,9 +238,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = */ USB_Descriptor_String_t PROGMEM LanguageString = { - Header: {Size: USB_STRING_LEN(1), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String}, - UnicodeString: {LANGUAGE_ID_ENG} + .UnicodeString = {LANGUAGE_ID_ENG} }; /** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable @@ -249,9 +249,9 @@ USB_Descriptor_String_t PROGMEM LanguageString = */ USB_Descriptor_String_t PROGMEM ManufacturerString = { - Header: {Size: USB_STRING_LEN(11), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String}, - UnicodeString: L"Dean Camera" + .UnicodeString = L"Dean Camera" }; /** Product descriptor string. This is a Unicode string containing the product's details in human readable form, @@ -260,12 +260,12 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = */ USB_Descriptor_String_t PROGMEM ProductString = { - Header: {Size: USB_STRING_LEN(18), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String}, - UnicodeString: L"LUFA Audio In Demo" + .UnicodeString = L"LUFA Audio In Demo" }; -/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h +/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" * documentation) by the application code so that the address and size of a requested descriptor can be given * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the @@ -285,22 +285,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c Address = DESCRIPTOR_ADDRESS(DeviceDescriptor); Size = sizeof(USB_Descriptor_Device_t); break; - case DTYPE_Configuration: + case DTYPE_Configuration: Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor); Size = sizeof(USB_Descriptor_Configuration_t); break; - case DTYPE_String: + case DTYPE_String: switch (DescriptorNumber) { - case 0x00: + case 0x00: Address = DESCRIPTOR_ADDRESS(LanguageString); Size = pgm_read_byte(&LanguageString.Header.Size); break; - case 0x01: + case 0x01: Address = DESCRIPTOR_ADDRESS(ManufacturerString); Size = pgm_read_byte(&ManufacturerString.Header.Size); break; - case 0x02: + case 0x02: Address = DESCRIPTOR_ADDRESS(ProductString); Size = pgm_read_byte(&ProductString.Header.Size); break;