X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6bda628718f67c04ed43e8328f55bdce5319c504..a9abe1fdea5ccf67aaccab6fdde300d6fcf2d15a:/Projects/RelayBoard/Descriptors.c diff --git a/Projects/RelayBoard/Descriptors.c b/Projects/RelayBoard/Descriptors.c index e792aec7e..e69bfc603 100644 --- a/Projects/RelayBoard/Descriptors.c +++ b/Projects/RelayBoard/Descriptors.c @@ -1,14 +1,14 @@ /* LUFA Library - Copyright (C) Dean Camera, 2010. + Copyright (C) Dean Camera, 2012. dean [at] fourwalledcubicle [dot] com - www.fourwalledcubicle.com + www.lufa-lib.org */ /* Copyright 2010 OBinou (obconseil [at] gmail [dot] com) - Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2012 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 @@ -43,14 +43,14 @@ * number of device configurations. The descriptor is read out by the USB host when the enumeration * process begins. */ -USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor = +const USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, .USBSpecification = VERSION_BCD(01.10), - .Class = 0xFF, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = USB_CSCP_VendorSpecificClass, + .SubClass = USB_CSCP_NoDeviceSubclass, + .Protocol = USB_CSCP_NoDeviceProtocol, .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, @@ -70,19 +70,19 @@ USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor = * and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting * a configuration so that the host may correctly communicate with the USB device. */ -RelayBoard_USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescriptor = +const USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescriptor = { .Config = { .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration}, - .TotalConfigurationSize = sizeof(RelayBoard_USB_Descriptor_Configuration_t), + .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), .TotalInterfaces = 1, .ConfigurationNumber = 1, .ConfigurationStrIndex = NO_DESCRIPTOR, - .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED, + .ConfigAttributes = USB_CONFIG_ATTR_RESERVED, .MaxPowerConsumption = USB_CONFIG_POWER_MA(500) }, @@ -96,7 +96,7 @@ RelayBoard_USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescri .TotalEndpoints = 0, - .Class = 0xFF, + .Class = USB_CSCP_VendorSpecificClass, .SubClass = 0x00, .Protocol = 0x00, @@ -108,7 +108,7 @@ RelayBoard_USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescri * the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate * via the language ID table available at USB.org what languages the device supports for its string descriptors. */ -USB_Descriptor_String_t PROGMEM RelayBoard_LanguageString = +const USB_Descriptor_String_t PROGMEM RelayBoard_LanguageString = { .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String}, @@ -119,7 +119,7 @@ USB_Descriptor_String_t PROGMEM RelayBoard_LanguageString = * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString = +const USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString = { .Header = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String}, @@ -130,7 +130,7 @@ USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString = * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -USB_Descriptor_String_t PROGMEM RelayBoard_ProductString = +const USB_Descriptor_String_t PROGMEM RelayBoard_ProductString = { .Header = {.Size = USB_STRING_LEN(10), .Type = DTYPE_String}, @@ -140,7 +140,7 @@ USB_Descriptor_String_t PROGMEM RelayBoard_ProductString = /** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a * series of uppercase hexadecimal digits. */ -USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = +const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = { .Header = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String}, @@ -155,41 +155,41 @@ USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = */ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, - void** const DescriptorAddress) + const void** const DescriptorAddress) { const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorNumber = (wValue & 0xFF); - void* Address = NULL; - uint16_t Size = NO_DESCRIPTOR; + const void* Address = NULL; + uint16_t Size = NO_DESCRIPTOR; switch (DescriptorType) { case DTYPE_Device: - Address = (void*)&RelayBoard_DeviceDescriptor; + Address = &RelayBoard_DeviceDescriptor; Size = sizeof(USB_Descriptor_Device_t); break; case DTYPE_Configuration: - Address = (void*)&RelayBoard_ConfigurationDescriptor; - Size = sizeof(RelayBoard_USB_Descriptor_Configuration_t); + Address = &RelayBoard_ConfigurationDescriptor; + Size = sizeof(USB_Descriptor_Configuration_t); break; case DTYPE_String: switch (DescriptorNumber) { case 0x00: - Address = (void*)&RelayBoard_LanguageString; + Address = &RelayBoard_LanguageString; Size = pgm_read_byte(&RelayBoard_LanguageString.Header.Size); break; case 0x01: - Address = (void*)&RelayBoard_ManufacturerString; + Address = &RelayBoard_ManufacturerString; Size = pgm_read_byte(&RelayBoard_ManufacturerString.Header.Size); break; case 0x02: - Address = (void*)&RelayBoard_ProductString; + Address = &RelayBoard_ProductString; Size = pgm_read_byte(&RelayBoard_ProductString.Header.Size); break; case 0x03: - Address = (void*)&RelayBoard_SerialString; + Address = &RelayBoard_SerialString; Size = pgm_read_byte(&RelayBoard_SerialString.Header.Size); break; } @@ -200,3 +200,4 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, *DescriptorAddress = Address; return Size; } +