fix compilation with latest aversive
[protos/xbee-avr.git] / Descriptors.c
diff --git a/Descriptors.c b/Descriptors.c
deleted file mode 100644 (file)
index ff1d09e..0000000
+++ /dev/null
@@ -1,386 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2011.\r
-\r
-  dean [at] fourwalledcubicle [dot] com\r
-           www.lufa-lib.org\r
-*/\r
-\r
-/*\r
-  Copyright 2011  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
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special\r
- *  computer-readable structures which the host requests upon device enumeration, to determine\r
- *  the device's capabilities and functions.\r
- */\r
-\r
-#include "Descriptors.h"\r
-\r
-/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as\r
- * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.\r
- * This allows the host to track a device across insertions on different ports, allowing them to retain allocated\r
- * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices\r
- * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value\r
- * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and\r
- * port location).\r
- */\r
-#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)\r
-       #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.\r
-#endif\r
-\r
-/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall\r
- *  device characteristics, including the supported USB version, control endpoint size and the\r
- *  number of device configurations. The descriptor is read out by the USB host when the enumeration\r
- *  process begins.\r
- */\r
-const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =\r
-{\r
-       .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},\r
-\r
-       .USBSpecification       = VERSION_BCD(01.10),\r
-       .Class                  = USB_CSCP_IADDeviceClass,\r
-       .SubClass               = USB_CSCP_IADDeviceSubclass,\r
-       .Protocol               = USB_CSCP_IADDeviceProtocol,\r
-\r
-       .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,\r
-\r
-       .VendorID               = 0x03EB,\r
-       .ProductID              = 0x204E,\r
-       .ReleaseNumber          = VERSION_BCD(00.01),\r
-\r
-       .ManufacturerStrIndex   = 0x01,\r
-       .ProductStrIndex        = 0x02,\r
-       .SerialNumStrIndex      = USE_INTERNAL_SERIAL,\r
-\r
-       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r
-};\r
-\r
-/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
- *  of the device in one of its supported configurations, including information about any device interfaces\r
- *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting\r
- *  a configuration so that the host may correctly communicate with the USB device.\r
- */\r
-const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =\r
-{\r
-       .Config =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},\r
-\r
-                       .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),\r
-                       .TotalInterfaces        = 4,\r
-\r
-                       .ConfigurationNumber    = 1,\r
-                       .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
-\r
-                       .ConfigAttributes       = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r
-\r
-                       .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
-               },\r
-\r
-       .CDC1_IAD =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},\r
-\r
-                       .FirstInterfaceIndex    = 0,\r
-                       .TotalInterfaces        = 2,\r
-\r
-                       .Class                  = CDC_CSCP_CDCClass,\r
-                       .SubClass               = CDC_CSCP_ACMSubclass,\r
-                       .Protocol               = CDC_CSCP_ATCommandProtocol,\r
-\r
-                       .IADStrIndex            = NO_DESCRIPTOR\r
-               },\r
-\r
-       .CDC1_CCI_Interface =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
-\r
-                       .InterfaceNumber        = 0,\r
-                       .AlternateSetting       = 0,\r
-\r
-                       .TotalEndpoints         = 1,\r
-\r
-                       .Class                  = CDC_CSCP_CDCClass,\r
-                       .SubClass               = CDC_CSCP_ACMSubclass,\r
-                       .Protocol               = CDC_CSCP_ATCommandProtocol,\r
-\r
-                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
-               },\r
-\r
-       .CDC1_Functional_Header =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},\r
-                       .Subtype                = CDC_DSUBTYPE_CSInterface_Header,\r
-\r
-                       .CDCSpecification       = VERSION_BCD(01.10),\r
-               },\r
-\r
-       .CDC1_Functional_ACM =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},\r
-                       .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,\r
-\r
-                       .Capabilities           = 0x06,\r
-               },\r
-\r
-       .CDC1_Functional_Union =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},\r
-                       .Subtype                = CDC_DSUBTYPE_CSInterface_Union,\r
-\r
-                       .MasterInterfaceNumber  = 0,\r
-                       .SlaveInterfaceNumber   = 1,\r
-               },\r
-\r
-       .CDC1_ManagementEndpoint =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-\r
-                       .EndpointAddress        = (ENDPOINT_DIR_IN | CDC1_NOTIFICATION_EPNUM),\r
-                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
-                       .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
-                       .PollingIntervalMS      = 0xFF\r
-               },\r
-\r
-       .CDC1_DCI_Interface =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
-\r
-                       .InterfaceNumber        = 1,\r
-                       .AlternateSetting       = 0,\r
-\r
-                       .TotalEndpoints         = 2,\r
-\r
-                       .Class                  = CDC_CSCP_CDCDataClass,\r
-                       .SubClass               = CDC_CSCP_NoDataSubclass,\r
-                       .Protocol               = CDC_CSCP_NoDataProtocol,\r
-\r
-                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
-               },\r
-\r
-       .CDC1_DataOutEndpoint =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-\r
-                       .EndpointAddress        = (ENDPOINT_DIR_OUT | CDC1_RX_EPNUM),\r
-                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
-                       .EndpointSize           = CDC_TXRX_EPSIZE,\r
-                       .PollingIntervalMS      = 0x01\r
-               },\r
-\r
-       .CDC1_DataInEndpoint =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-\r
-                       .EndpointAddress        = (ENDPOINT_DIR_IN | CDC1_TX_EPNUM),\r
-                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
-                       .EndpointSize           = CDC_TXRX_EPSIZE,\r
-                       .PollingIntervalMS      = 0x01\r
-               },\r
-\r
-       .CDC2_IAD =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},\r
-\r
-                       .FirstInterfaceIndex    = 2,\r
-                       .TotalInterfaces        = 2,\r
-\r
-                       .Class                  = CDC_CSCP_CDCClass,\r
-                       .SubClass               = CDC_CSCP_ACMSubclass,\r
-                       .Protocol               = CDC_CSCP_ATCommandProtocol,\r
-\r
-                       .IADStrIndex            = NO_DESCRIPTOR\r
-               },\r
-\r
-       .CDC2_CCI_Interface =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
-\r
-                       .InterfaceNumber        = 2,\r
-                       .AlternateSetting       = 0,\r
-\r
-                       .TotalEndpoints         = 1,\r
-\r
-                       .Class                  = CDC_CSCP_CDCClass,\r
-                       .SubClass               = CDC_CSCP_ACMSubclass,\r
-                       .Protocol               = CDC_CSCP_ATCommandProtocol,\r
-\r
-                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
-               },\r
-\r
-       .CDC2_Functional_Header =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},\r
-                       .Subtype                = CDC_DSUBTYPE_CSInterface_Header,\r
-\r
-                       .CDCSpecification       = VERSION_BCD(01.10),\r
-               },\r
-\r
-       .CDC2_Functional_ACM =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},\r
-                       .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,\r
-\r
-                       .Capabilities           = 0x06,\r
-               },\r
-\r
-       .CDC2_Functional_Union =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},\r
-                       .Subtype                = CDC_DSUBTYPE_CSInterface_Union,\r
-\r
-                       .MasterInterfaceNumber  = 2,\r
-                       .SlaveInterfaceNumber   = 3,\r
-               },\r
-\r
-       .CDC2_ManagementEndpoint =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-\r
-                       .EndpointAddress        = (ENDPOINT_DIR_IN | CDC2_NOTIFICATION_EPNUM),\r
-                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
-                       .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
-                       .PollingIntervalMS      = 0xFF\r
-               },\r
-\r
-       .CDC2_DCI_Interface =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
-\r
-                       .InterfaceNumber        = 3,\r
-                       .AlternateSetting       = 0,\r
-\r
-                       .TotalEndpoints         = 2,\r
-\r
-                       .Class                  = CDC_CSCP_CDCDataClass,\r
-                       .SubClass               = CDC_CSCP_NoDataSubclass,\r
-                       .Protocol               = CDC_CSCP_NoDataProtocol,\r
-\r
-                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
-               },\r
-\r
-       .CDC2_DataOutEndpoint =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-\r
-                       .EndpointAddress        = (ENDPOINT_DIR_OUT | CDC2_RX_EPNUM),\r
-                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
-                       .EndpointSize           = CDC_TXRX_EPSIZE,\r
-                       .PollingIntervalMS      = 0x01\r
-               },\r
-\r
-       .CDC2_DataInEndpoint =\r
-               {\r
-                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
-\r
-                       .EndpointAddress        = (ENDPOINT_DIR_IN | CDC2_TX_EPNUM),\r
-                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
-                       .EndpointSize           = CDC_TXRX_EPSIZE,\r
-                       .PollingIntervalMS      = 0x01\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
-const USB_Descriptor_String_t PROGMEM LanguageString =\r
-{\r
-       .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},\r
-\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
- *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device\r
- *  Descriptor.\r
- */\r
-const USB_Descriptor_String_t PROGMEM ManufacturerString =\r
-{\r
-       .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},\r
-\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
- *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device\r
- *  Descriptor.\r
- */\r
-const USB_Descriptor_String_t PROGMEM ProductString =\r
-{\r
-       .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},\r
-\r
-       .UnicodeString          = L"LUFA Dual CDC Demo"\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 CALLBACK_USB_GetDescriptor(const uint16_t wValue,\r
-                                    const uint8_t wIndex,\r
-                                    const void** const DescriptorAddress)\r
-{\r
-       const uint8_t  DescriptorType   = (wValue >> 8);\r
-       const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
-\r
-       const void* Address = NULL;\r
-       uint16_t    Size    = NO_DESCRIPTOR;\r
-\r
-       switch (DescriptorType)\r
-       {\r
-               case DTYPE_Device:\r
-                       Address = &DeviceDescriptor;\r
-                       Size    = sizeof(USB_Descriptor_Device_t);\r
-                       break;\r
-               case DTYPE_Configuration:\r
-                       Address = &ConfigurationDescriptor;\r
-                       Size    = sizeof(USB_Descriptor_Configuration_t);\r
-                       break;\r
-               case DTYPE_String:\r
-                       switch (DescriptorNumber)\r
-                       {\r
-                               case 0x00:\r
-                                       Address = &LanguageString;\r
-                                       Size    = pgm_read_byte(&LanguageString.Header.Size);\r
-                                       break;\r
-                               case 0x01:\r
-                                       Address = &ManufacturerString;\r
-                                       Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
-                                       break;\r
-                               case 0x02:\r
-                                       Address = &ProductString;\r
-                                       Size    = pgm_read_byte(&ProductString.Header.Size);\r
-                                       break;\r
-                       }\r
-\r
-                       break;\r
-       }\r
-\r
-       *DescriptorAddress = Address;\r
-       return Size;\r
-}\r
-\r