/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
*/\r
USB_Descriptor_Device_t 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: 0x02,\r
- SubClass: 0x00,\r
- Protocol: 0x00,\r
+ .USBSpecification = VERSION_BCD(01.10),\r
+ .Class = 0x02,\r
+ .SubClass = 0x00,\r
+ .Protocol = 0x00,\r
\r
- Endpoint0Size: FIXED_CONTROL_ENDPOINT_SIZE,\r
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,\r
\r
- VendorID: 0x03EB,\r
- ProductID: 0x204A,\r
- ReleaseNumber: 0x0000,\r
+ .VendorID = 0x03EB,\r
+ .ProductID = 0x204A,\r
+ .ReleaseNumber = 0x0000,\r
\r
- ManufacturerStrIndex: NO_DESCRIPTOR,\r
- ProductStrIndex: 0x01,\r
- SerialNumStrIndex: NO_DESCRIPTOR,\r
+ .ManufacturerStrIndex = NO_DESCRIPTOR,\r
+ .ProductStrIndex = 0x01,\r
+ .SerialNumStrIndex = NO_DESCRIPTOR,\r
\r
- NumberOfConfigurations: 1\r
+ .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r
};\r
\r
/** Configuration descriptor structure. This descriptor, located in SRAM memory, describes the usage\r
*/\r
USB_Descriptor_Configuration_t 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,\r
\r
- MaxPowerConsumption: USB_CONFIG_POWER_MA(100)\r
+ .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)\r
},\r
\r
- CCI_Interface:\r
+ .CCI_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: 0,\r
- AlternateSetting: 0,\r
+ .InterfaceNumber = 0,\r
+ .AlternateSetting = 0,\r
\r
- TotalEndpoints: 1,\r
+ .TotalEndpoints = 1,\r
\r
- Class: 0x02,\r
- SubClass: 0x02,\r
- Protocol: 0x01,\r
+ .Class = 0x02,\r
+ .SubClass = 0x02,\r
+ .Protocol = 0x01,\r
\r
- InterfaceStrIndex: NO_DESCRIPTOR\r
+ .InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- CDC_Functional_IntHeader:\r
+ .CDC_Functional_IntHeader = \r
{\r
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},\r
- SubType: 0x00,\r
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
+ .SubType = 0x00,\r
\r
- Data: {0x10, 0x01}\r
+ .Data = {0x10, 0x01}\r
},\r
\r
- CDC_Functional_CallManagement:\r
+ .CDC_Functional_CallManagement = \r
{\r
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},\r
- SubType: 0x01,\r
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
+ .SubType = 0x01,\r
\r
- Data: {0x03, 0x01}\r
+ .Data = {0x03, 0x01}\r
},\r
\r
- CDC_Functional_AbstractControlManagement:\r
+ .CDC_Functional_AbstractControlManagement = \r
{\r
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), Type: 0x24},\r
- SubType: 0x02,\r
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
+ .SubType = 0x02,\r
\r
- Data: {0x06}\r
+ .Data = {0x06}\r
},\r
\r
- CDC_Functional_Union:\r
+ .CDC_Functional_Union = \r
{\r
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},\r
- SubType: 0x06,\r
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
+ .SubType = 0x06,\r
\r
- Data: {0x00, 0x01}\r
+ .Data = {0x00, 0x01}\r
}, \r
\r
- ManagementEndpoint:\r
+ .ManagementEndpoint = \r
{\r
- Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
- EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),\r
- Attributes: EP_TYPE_INTERRUPT,\r
- EndpointSize: CDC_NOTIFICATION_EPSIZE,\r
- PollingIntervalMS: 0x02\r
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),\r
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+ .EndpointSize = CDC_NOTIFICATION_EPSIZE,\r
+ .PollingIntervalMS = 0x02\r
},\r
\r
- DCI_Interface:\r
+ .DCI_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: 2,\r
+ .TotalEndpoints = 2,\r
\r
- Class: 0x0A,\r
- SubClass: 0x00,\r
- Protocol: 0x00,\r
+ .Class = 0x0A,\r
+ .SubClass = 0x00,\r
+ .Protocol = 0x00,\r
\r
- InterfaceStrIndex: NO_DESCRIPTOR\r
+ .InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- DataOutEndpoint:\r
+ .DataOutEndpoint = \r
{\r
- Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
- EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),\r
- Attributes: EP_TYPE_BULK,\r
- EndpointSize: CDC_TXRX_EPSIZE,\r
- PollingIntervalMS: 0x00\r
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),\r
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+ .EndpointSize = CDC_TXRX_EPSIZE,\r
+ .PollingIntervalMS = 0x00\r
},\r
\r
- DataInEndpoint:\r
+ .DataInEndpoint = \r
{\r
- Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
- EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),\r
- Attributes: EP_TYPE_BULK,\r
- EndpointSize: CDC_TXRX_EPSIZE,\r
- PollingIntervalMS: 0x00\r
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),\r
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+ .EndpointSize = CDC_TXRX_EPSIZE,\r
+ .PollingIntervalMS = 0x00\r
}\r
};\r
\r
*/\r
USB_Descriptor_String_t 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
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,\r
*/\r
USB_Descriptor_String_t ProductString =\r
{\r
- Header: {Size: USB_STRING_LEN(15), Type: DTYPE_String},\r
+ .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},\r
\r
- UnicodeString: L"AVR CDC Bootloader"\r
+ .UnicodeString = L"AVR CDC Bootloader"\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 LUFA 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
+ Address = (void*)&ConfigurationDescriptor;\r
Size = sizeof(USB_Descriptor_Configuration_t);\r
break;\r
case DTYPE_String:\r
if (!(DescriptorNumber))\r
{\r
- Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+ Address = (void*)&LanguageString;\r
Size = LanguageString.Header.Size;\r
}\r
else\r
{\r
- Address = DESCRIPTOR_ADDRESS(ProductString);\r
+ Address = (void*)&ProductString;\r
Size = ProductString.Header.Size;\r
}\r
\r
projects / pub / USBasp.git / blobdiff