*/\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: 0x2040,\r
- ReleaseNumber: 0x0000,\r
+ .VendorID = 0x03EB,\r
+ .ProductID = 0x2040,\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_Header_t)\r
- + sizeof(USB_Descriptor_Interface_t) ),\r
+ .TotalConfigurationSize = ( sizeof(USB_Descriptor_Configuration_Header_t)\r
+ + sizeof(USB_Descriptor_Interface_t) ),\r
\r
- TotalInterfaces: 1,\r
+ .TotalInterfaces = 1,\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
- Interface:\r
+ .Interface = \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: 0xFF,\r
- SubClass: 0x00,\r
- Protocol: 0x00,\r
+ .Class = 0xFF,\r
+ .SubClass = 0x00,\r
+ .Protocol = 0x00,\r
\r
- InterfaceStrIndex: NO_DESCRIPTOR\r
+ .InterfaceStrIndex = NO_DESCRIPTOR\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(9), Type: DTYPE_String},\r
+ .Header = {.Size = USB_STRING_LEN(9), .Type = DTYPE_String},\r
\r
- UnicodeString: L"LUFA Demo"\r
+ .UnicodeString = L"LUFA 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 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
-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
{\r
const uint8_t DescriptorType = (wValue >> 8);\r
const uint8_t DescriptorNumber = (wValue & 0xFF);\r
switch (DescriptorType)\r
{\r
case DTYPE_Device:\r
- Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+ Address = (void*)&DeviceDescriptor;\r
Size = sizeof(USB_Descriptor_Device_t);\r
break;\r
- case DTYPE_Configuration:\r
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+ case DTYPE_Configuration: \r
+ Address = (void*)&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
- Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+ case 0x00: \r
+ Address = (void*)&LanguageString;\r
Size = pgm_read_byte(&LanguageString.Header.Size);\r
break;\r
- case 0x01:\r
- Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
+ case 0x01: \r
+ Address = (void*)&ManufacturerString;\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);\r
break;\r
- case 0x02:\r
- Address = DESCRIPTOR_ADDRESS(ProductString);\r
+ case 0x02: \r
+ Address = (void*)&ProductString;\r
Size = pgm_read_byte(&ProductString.Header.Size);\r
break;\r
}\r
projects / pub / USBasp.git / blobdiff