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