/*\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
+ Copyright 2010 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
+ 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
USB_Descriptor_HIDReport_Datatype_t HIDReport[] =\r
{\r
0x06, 0x9c, 0xff, /* Usage Page (Vendor Defined) */\r
- 0x09, 0x19, /* Usage (Vendor Defined) */\r
+ 0x09, 0x1B, /* Usage (Vendor Defined) */\r
0xa1, 0x01, /* Collection (Vendor Defined) */\r
0x0a, 0x19, 0x00, /* Usage (Vendor Defined) */\r
0x75, 0x08, /* Report Size (8) */\r
\r
.VendorID = 0x16C0,\r
.ProductID = 0x0478,\r
- .ReleaseNumber = 0x0010,\r
+ .ReleaseNumber = 0x0120,\r
\r
.ManufacturerStrIndex = NO_DESCRIPTOR,\r
- .ProductStrIndex = 0x01,\r
+ .ProductStrIndex = NO_DESCRIPTOR,\r
.SerialNumStrIndex = NO_DESCRIPTOR,\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
.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
},\r
\r
- .Interface = \r
+ .HID_Interface = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
\r
.InterfaceStrIndex = NO_DESCRIPTOR\r
},\r
\r
- .HIDDescriptor = \r
+ .HID_VendorHID = \r
{ \r
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
\r
.HIDSpec = VERSION_BCD(01.11),\r
.CountryCode = 0x00,\r
- .TotalHIDReports = 0x01,\r
+ .TotalHIDDescriptors = 1,\r
.HIDReportType = DTYPE_Report,\r
.HIDReportLength = sizeof(HIDReport)\r
},\r
\r
- .HIDEndpoint = \r
+ .HID_ReportINEndpoint = \r
{\r
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
\r
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | HID_EPNUM),\r
- .Attributes = EP_TYPE_INTERRUPT,\r
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
.EndpointSize = HID_EPSIZE,\r
.PollingIntervalMS = 0x40\r
},\r
};\r
\r
-/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests\r
- * the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate\r
- * via the language ID table available at USB.org what languages the device supports for its string descriptors.\r
- */\r
-USB_Descriptor_String_t LanguageString =\r
-{\r
- .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},\r
- \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
- * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device\r
- * Descriptor.\r
- */\r
-USB_Descriptor_String_t ProductString =\r
-{\r
- .Header = {.Size = USB_STRING_LEN(21), .Type = DTYPE_String},\r
- \r
- .UnicodeString = L"AVR Teensy Bootloader"\r
-};\r
-\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
+ const uint8_t DescriptorType = (wValue >> 8);\r
\r
void* Address = NULL;\r
uint16_t Size = NO_DESCRIPTOR;\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
- Size = LanguageString.Header.Size;\r
- }\r
- else\r
- {\r
- Address = DESCRIPTOR_ADDRESS(ProductString);\r
- Size = ProductString.Header.Size;\r
- }\r
- \r
- break;\r
case DTYPE_HID:\r
- Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.HIDDescriptor);\r
+ Address = (void*)&ConfigurationDescriptor.HID_VendorHID;\r
Size = sizeof(USB_Descriptor_HID_t);\r
break;\r
case DTYPE_Report:\r
- Address = DESCRIPTOR_ADDRESS(HIDReport);\r
+ Address = (void*)&HIDReport;\r
Size = sizeof(HIDReport);\r
break;\r
}\r
projects / pub / USBasp.git / blobdiff