/*\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 Denver Gingerich (denver [at] ossguy [dot] com)\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 Denver Gingerich (denver [at] ossguy [dot] com)\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 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 = FIXED_CONTROL_ENDPOINT_SIZE,\r
\r
- VendorID: 0x03EB,\r
- ProductID: 0x2042,\r
- ReleaseNumber: 0x0000,\r
+ .VendorID = 0x03EB,\r
+ .ProductID = 0x2042,\r
+ .ReleaseNumber = 0x0000,\r
\r
- ManufacturerStrIndex: 0x01,\r
- ProductStrIndex: 0x02,\r
- SerialNumStrIndex: NO_DESCRIPTOR,\r
+ .ManufacturerStrIndex = 0x01,\r
+ .ProductStrIndex = 0x02,\r
+ .SerialNumStrIndex = USE_INTERNAL_SERIAL,\r
\r
- NumberOfConfigurations: 1\r
+ .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\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: 1,\r
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),\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: 0x00,\r
- AlternateSetting: 0x00,\r
+ .InterfaceNumber = 0x00,\r
+ .AlternateSetting = 0x00,\r
\r
- TotalEndpoints: 1,\r
+ .TotalEndpoints = 1,\r
\r
- Class: 0x03,\r
- SubClass: 0x01,\r
- Protocol: 0x01,\r
+ .Class = 0x03,\r
+ .SubClass = 0x01,\r
+ .Protocol = 0x01,\r
\r
- InterfaceStrIndex: NO_DESCRIPTOR\r
+ .InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- KeyboardHID:\r
+ .KeyboardHID = \r
{ \r
- Header: {Size: sizeof(USB_Descriptor_HID_t), Type: DTYPE_HID},\r
+ .Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
\r
- HIDSpec: VERSION_BCD(01.11),\r
- CountryCode: 0x00,\r
- TotalHIDReports: 0x01,\r
- HIDReportType: DTYPE_Report,\r
- HIDReportLength: sizeof(KeyboardReport)\r
+ .HIDSpec = VERSION_BCD(01.11),\r
+ .CountryCode = 0x00,\r
+ .TotalReportDescriptors = 1,\r
+ .HIDReportType = DTYPE_Report,\r
+ .HIDReportLength = sizeof(KeyboardReport)\r
},\r
\r
- KeyboardEndpoint:\r
+ .KeyboardEndpoint = \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 | KEYBOARD_EPNUM),\r
- Attributes: EP_TYPE_INTERRUPT,\r
- EndpointSize: KEYBOARD_EPSIZE,\r
- PollingIntervalMS: 0x02\r
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),\r
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+ .EndpointSize = KEYBOARD_EPSIZE,\r
+ .PollingIntervalMS = 0x01\r
},\r
};\r
\r
* via the language ID table available at USB.org what languages the device supports for its string descriptors. */ \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(32), Type: DTYPE_String},\r
+ .Header = {.Size = USB_STRING_LEN(32), .Type = DTYPE_String},\r
\r
- UnicodeString: L"Dean Camera and Denver Gingerich"\r
+ .UnicodeString = L"Dean Camera and Denver Gingerich"\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(20), Type: DTYPE_String},\r
+ .Header = {.Size = USB_STRING_LEN(20), .Type = DTYPE_String},\r
\r
- UnicodeString: L"Magnetic Card Reader"\r
+ .UnicodeString = L"Magnetic Card Reader"\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
-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
switch (DescriptorNumber)\r
{\r
case 0x00:\r
- Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+ Address = (void*)&LanguageString;\r
Size = pgm_read_byte(&LanguageString.Header.Size);\r
break;\r
case 0x01:\r
- Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
+ Address = (void*)&ManufacturerString;\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);\r
break;\r
case 0x02:\r
- Address = DESCRIPTOR_ADDRESS(ProductString);\r
+ Address = (void*)&ProductString;\r
Size = pgm_read_byte(&ProductString.Header.Size);\r
break;\r
}\r
\r
break;\r
case DTYPE_HID:\r
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID);\r
- Size = sizeof(USB_Descriptor_HID_t);\r
+ Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
+ Size = sizeof(USB_HID_Descriptor_t);\r
break;\r
case DTYPE_Report:\r
- Address = DESCRIPTOR_ADDRESS(KeyboardReport);\r
+ Address = (void*)&KeyboardReport;\r
Size = sizeof(KeyboardReport);\r
break;\r
}\r
projects / pub / USBasp.git / blobdiff