*/\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(01.10),\r
- Class: 0x00,\r
- SubClass: 0x00,\r
- Protocol: 0x00,\r
+ .USBSpecification = VERSION_BCD(01.10),\r
+ .Class = 0x00,\r
+ .SubClass = 0x00,\r
+ .Protocol = 0x00,\r
\r
- Endpoint0Size: 8,\r
+ .Endpoint0Size = 8,\r
\r
- VendorID: 0x03EB,\r
- ProductID: 0x2048,\r
- ReleaseNumber: 0x0000,\r
+ .VendorID = 0x03EB,\r
+ .ProductID = 0x2048,\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
+ .ACSpecification = VERSION_BCD(01.00),\r
+ .TotalLength = sizeof(USB_AudioInterface_AC_t),\r
\r
- InCollection: 1,\r
- InterfaceNumbers: {1}, \r
+ .InCollection = 1,\r
+ .InterfaceNumbers = {1}, \r
},\r
\r
- AudioStreamInterface:\r
+ .AudioStreamInterface = \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: 2,\r
+ .TotalEndpoints = 2,\r
\r
- Class: 0x01,\r
- SubClass: 0x03,\r
- Protocol: 0x00,\r
+ .Class = 0x01,\r
+ .SubClass = 0x03,\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_MIDI_AS_t), Type: DTYPE_AudioInterface},\r
- Subtype: DSUBTYPE_General,\r
+ .Header = {.Size = sizeof(USB_AudioInterface_MIDI_AS_t), .Type = DTYPE_AudioInterface},\r
+ .Subtype = DSUBTYPE_General,\r
\r
- AudioSpecification: VERSION_BCD(01.00),\r
+ .AudioSpecification = VERSION_BCD(01.00),\r
\r
- TotalLength: (sizeof(USB_Descriptor_Configuration_t) - offsetof(USB_Descriptor_Configuration_t, AudioStreamInterface_SPC))\r
+ .TotalLength = (sizeof(USB_Descriptor_Configuration_t) - offsetof(USB_Descriptor_Configuration_t, AudioStreamInterface_SPC))\r
},\r
\r
- MIDI_In_Jack_Emb:\r
+ .MIDI_In_Jack_Emb = \r
{\r
- Header: {Size: sizeof(USB_MIDI_In_Jack_t), Type: DTYPE_AudioInterface},\r
- Subtype: DSUBTYPE_InputJack,\r
+ .Header = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
+ .Subtype = DSUBTYPE_InputJack,\r
\r
- JackType: JACKTYPE_EMBEDDED,\r
- JackID: 0x01,\r
+ .JackType = JACKTYPE_EMBEDDED,\r
+ .JackID = 0x01,\r
\r
- JackStrIndex: NO_DESCRIPTOR\r
+ .JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- MIDI_In_Jack_Ext:\r
+ .MIDI_In_Jack_Ext = \r
{\r
- Header: {Size: sizeof(USB_MIDI_In_Jack_t), Type: DTYPE_AudioInterface},\r
- Subtype: DSUBTYPE_InputJack,\r
+ .Header = {.Size = sizeof(USB_MIDI_In_Jack_t), .Type = DTYPE_AudioInterface},\r
+ .Subtype = DSUBTYPE_InputJack,\r
\r
- JackType: JACKTYPE_EXTERNAL,\r
- JackID: 0x02,\r
+ .JackType = JACKTYPE_EXTERNAL,\r
+ .JackID = 0x02,\r
\r
- JackStrIndex: NO_DESCRIPTOR\r
+ .JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- MIDI_Out_Jack_Emb:\r
+ .MIDI_Out_Jack_Emb = \r
{\r
- Header: {Size: sizeof(USB_MIDI_Out_Jack_t), Type: DTYPE_AudioInterface},\r
- Subtype: DSUBTYPE_OutputJack,\r
+ .Header = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
+ .Subtype = DSUBTYPE_OutputJack,\r
\r
- JackType: JACKTYPE_EMBEDDED,\r
- JackID: 0x03,\r
+ .JackType = JACKTYPE_EMBEDDED,\r
+ .JackID = 0x03,\r
\r
- NumberOfPins: 1,\r
- SourceJackID: {0x02},\r
- SourcePinID: {0x01},\r
+ .NumberOfPins = 1,\r
+ .SourceJackID = {0x02},\r
+ .SourcePinID = {0x01},\r
\r
- JackStrIndex: NO_DESCRIPTOR\r
+ .JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- MIDI_Out_Jack_Ext:\r
+ .MIDI_Out_Jack_Ext = \r
{\r
- Header: {Size: sizeof(USB_MIDI_Out_Jack_t), Type: DTYPE_AudioInterface},\r
- Subtype: DSUBTYPE_OutputJack,\r
+ .Header = {.Size = sizeof(USB_MIDI_Out_Jack_t), .Type = DTYPE_AudioInterface},\r
+ .Subtype = DSUBTYPE_OutputJack,\r
\r
- JackType: JACKTYPE_EXTERNAL,\r
- JackID: 0x04,\r
+ .JackType = JACKTYPE_EXTERNAL,\r
+ .JackID = 0x04,\r
\r
- NumberOfPins: 1,\r
- SourceJackID: {0x01},\r
- SourcePinID: {0x01},\r
+ .NumberOfPins = 1,\r
+ .SourceJackID = {0x01},\r
+ .SourcePinID = {0x01},\r
\r
- JackStrIndex: NO_DESCRIPTOR\r
+ .JackStrIndex = NO_DESCRIPTOR\r
},\r
\r
- MIDI_In_Jack_Endpoint:\r
+ .MIDI_In_Jack_Endpoint = \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_OUT | MIDI_STREAM_OUT_EPNUM),\r
- Attributes: (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
- EndpointSize: MIDI_STREAM_EPSIZE,\r
- PollingIntervalMS: 0\r
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | MIDI_STREAM_OUT_EPNUM),\r
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+ .EndpointSize = MIDI_STREAM_EPSIZE,\r
+ .PollingIntervalMS = 0\r
},\r
\r
- Refresh: 0,\r
- SyncEndpointNumber: 0\r
+ .Refresh = 0,\r
+ .SyncEndpointNumber = 0\r
},\r
\r
- MIDI_In_Jack_Endpoint_SPC:\r
+ .MIDI_In_Jack_Endpoint_SPC = \r
{\r
- Header: {Size: sizeof(USB_MIDI_Jack_Endpoint_t), Type: DTYPE_AudioEndpoint},\r
- Subtype: DSUBTYPE_General,\r
+ .Header = {.Size = sizeof(USB_MIDI_Jack_Endpoint_t), .Type = DTYPE_AudioEndpoint},\r
+ .Subtype = DSUBTYPE_General,\r
\r
- TotalEmbeddedJacks: 0x01,\r
- AssociatedJackID: {0x01}\r
+ .TotalEmbeddedJacks = 0x01,\r
+ .AssociatedJackID = {0x01}\r
},\r
\r
- MIDI_Out_Jack_Endpoint:\r
+ .MIDI_Out_Jack_Endpoint = \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 | MIDI_STREAM_IN_EPNUM),\r
- Attributes: (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
- EndpointSize: MIDI_STREAM_EPSIZE,\r
- PollingIntervalMS: 0\r
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MIDI_STREAM_IN_EPNUM),\r
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+ .EndpointSize = MIDI_STREAM_EPSIZE,\r
+ .PollingIntervalMS = 0\r
},\r
\r
- Refresh: 0,\r
- SyncEndpointNumber: 0\r
+ .Refresh = 0,\r
+ .SyncEndpointNumber = 0\r
},\r
\r
- MIDI_Out_Jack_Endpoint_SPC:\r
+ .MIDI_Out_Jack_Endpoint_SPC = \r
{\r
- Header: {Size: sizeof(USB_MIDI_Jack_Endpoint_t), Type: DTYPE_AudioEndpoint},\r
- Subtype: DSUBTYPE_General,\r
+ .Header = {.Size = sizeof(USB_MIDI_Jack_Endpoint_t), .Type = DTYPE_AudioEndpoint},\r
+ .Subtype = DSUBTYPE_General,\r
\r
- TotalEmbeddedJacks: 0x01,\r
- AssociatedJackID: {0x03}\r
+ .TotalEmbeddedJacks = 0x01,\r
+ .AssociatedJackID = {0x03}\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(14), Type: DTYPE_String},\r
+ .Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},\r
\r
- UnicodeString: L"LUFA MIDI Demo"\r
+ .UnicodeString = L"LUFA MIDI Demo"\r
};\r
\r
/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h\r
\r
switch (DescriptorType)\r
{\r
- case DTYPE_Device:\r
+ case DTYPE_Device: \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 / lufa.git / blobdiff