X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/032a83e9e1bda3b4724870ad65310414a8020351..071fd8ce536522ca6365580d64cd465e4c18a031:/Projects/Magstripe/Descriptors.c diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c index 6811f5266..b9aa0d788 100644 --- a/Projects/Magstripe/Descriptors.c +++ b/Projects/Magstripe/Descriptors.c @@ -1,22 +1,22 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ /* - Copyright 2009 Denver Gingerich (denver [at] ossguy [dot] com) - Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and without fee is hereby - granted, provided that the above copyright notice appear in all - copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + Copyright 2010 Denver Gingerich (denver [at] ossguy [dot] com) + Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -78,24 +78,24 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] = */ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { - Header: {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device}, + .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - USBSpecification: VERSION_BCD(01.10), - Class: 0x00, - SubClass: 0x00, - Protocol: 0x00, + .USBSpecification = VERSION_BCD(01.10), + .Class = 0x00, + .SubClass = 0x00, + .Protocol = 0x00, - Endpoint0Size: 8, + .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, - VendorID: 0x03EB, - ProductID: 0x2042, - ReleaseNumber: 0x0000, + .VendorID = 0x03EB, + .ProductID = 0x2042, + .ReleaseNumber = 0x0000, - ManufacturerStrIndex: 0x01, - ProductStrIndex: 0x02, - SerialNumStrIndex: NO_DESCRIPTOR, + .ManufacturerStrIndex = 0x01, + .ProductStrIndex = 0x02, + .SerialNumStrIndex = USE_INTERNAL_SERIAL, - NumberOfConfigurations: 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage @@ -105,56 +105,56 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = */ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { - Config: + .Config = { - Header: {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration}, + .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration}, - TotalConfigurationSize: sizeof(USB_Descriptor_Configuration_t), - TotalInterfaces: 1, + .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), + .TotalInterfaces = 1, - ConfigurationNumber: 1, - ConfigurationStrIndex: NO_DESCRIPTOR, + .ConfigurationNumber = 1, + .ConfigurationStrIndex = NO_DESCRIPTOR, - ConfigAttributes: (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED), + .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED), - MaxPowerConsumption: USB_CONFIG_POWER_MA(100) + .MaxPowerConsumption = USB_CONFIG_POWER_MA(100) }, - Interface: + .Interface = { - Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface}, + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - InterfaceNumber: 0x00, - AlternateSetting: 0x00, + .InterfaceNumber = 0x00, + .AlternateSetting = 0x00, - TotalEndpoints: 1, + .TotalEndpoints = 1, - Class: 0x03, - SubClass: 0x01, - Protocol: 0x01, + .Class = 0x03, + .SubClass = 0x01, + .Protocol = 0x01, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, - KeyboardHID: + .KeyboardHID = { - Header: {Size: sizeof(USB_Descriptor_HID_t), Type: DTYPE_HID}, + .Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID}, - HIDSpec: VERSION_BCD(01.11), - CountryCode: 0x00, - TotalHIDReports: 0x01, - HIDReportType: DTYPE_Report, - HIDReportLength: sizeof(KeyboardReport) + .HIDSpec = VERSION_BCD(01.11), + .CountryCode = 0x00, + .TotalReportDescriptors = 1, + .HIDReportType = DTYPE_Report, + .HIDReportLength = sizeof(KeyboardReport) }, - KeyboardEndpoint: + .KeyboardEndpoint = { - Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint}, + .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, - EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM), - Attributes: EP_TYPE_INTERRUPT, - EndpointSize: KEYBOARD_EPSIZE, - PollingIntervalMS: 0x02 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM), + .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = KEYBOARD_EPSIZE, + .PollingIntervalMS = 0x01 }, }; @@ -163,9 +163,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = * via the language ID table available at USB.org what languages the device supports for its string descriptors. */ USB_Descriptor_String_t PROGMEM LanguageString = { - Header: {Size: USB_STRING_LEN(1), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String}, - UnicodeString: {LANGUAGE_ID_ENG} + .UnicodeString = {LANGUAGE_ID_ENG} }; /** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable @@ -174,9 +174,9 @@ USB_Descriptor_String_t PROGMEM LanguageString = */ USB_Descriptor_String_t PROGMEM ManufacturerString = { - Header: {Size: USB_STRING_LEN(32), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(32), .Type = DTYPE_String}, - UnicodeString: L"Dean Camera and Denver Gingerich" + .UnicodeString = L"Dean Camera and Denver Gingerich" }; /** Product descriptor string. This is a Unicode string containing the product's details in human readable form, @@ -185,18 +185,18 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = */ USB_Descriptor_String_t PROGMEM ProductString = { - Header: {Size: USB_STRING_LEN(20), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(20), .Type = DTYPE_String}, - UnicodeString: L"Magnetic Card Reader" + .UnicodeString = L"Magnetic Card Reader" }; -/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h +/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" * documentation) by the application code so that the address and size of a requested descriptor can be given - * to the USB library. When the device recieves a Get Descriptor request on the control endpoint, this function + * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the * USB host. */ -uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) { const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorNumber = (wValue & 0xFF); @@ -207,37 +207,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c switch (DescriptorType) { case DTYPE_Device: - Address = DESCRIPTOR_ADDRESS(DeviceDescriptor); + Address = (void*)&DeviceDescriptor; Size = sizeof(USB_Descriptor_Device_t); break; case DTYPE_Configuration: - Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor); + Address = (void*)&ConfigurationDescriptor; Size = sizeof(USB_Descriptor_Configuration_t); break; case DTYPE_String: switch (DescriptorNumber) { case 0x00: - Address = DESCRIPTOR_ADDRESS(LanguageString); + Address = (void*)&LanguageString; Size = pgm_read_byte(&LanguageString.Header.Size); break; case 0x01: - Address = DESCRIPTOR_ADDRESS(ManufacturerString); + Address = (void*)&ManufacturerString; Size = pgm_read_byte(&ManufacturerString.Header.Size); break; case 0x02: - Address = DESCRIPTOR_ADDRESS(ProductString); + Address = (void*)&ProductString; Size = pgm_read_byte(&ProductString.Header.Size); break; } break; case DTYPE_HID: - Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID); - Size = sizeof(USB_Descriptor_HID_t); + Address = (void*)&ConfigurationDescriptor.KeyboardHID; + Size = sizeof(USB_HID_Descriptor_t); break; case DTYPE_Report: - Address = DESCRIPTOR_ADDRESS(KeyboardReport); + Address = (void*)&KeyboardReport; Size = sizeof(KeyboardReport); break; }