X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c1a1b6eeecb375259968ef6d989833312047f2d8..15f84bb8f5b910de40f081ee5e8ed847c592ea17:/Bootloaders/CDC/Descriptors.c?ds=sidebyside diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index ee0e194d8..38906cfb4 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -1,21 +1,21 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.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 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 @@ -44,24 +44,24 @@ */ USB_Descriptor_Device_t 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: 0x02, - SubClass: 0x00, - Protocol: 0x00, + .USBSpecification = VERSION_BCD(01.10), + .Class = 0x02, + .SubClass = 0x00, + .Protocol = 0x00, - Endpoint0Size: FIXED_CONTROL_ENDPOINT_SIZE, + .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, - VendorID: 0x03EB, - ProductID: 0x204A, - ReleaseNumber: 0x0000, + .VendorID = 0x03EB, + .ProductID = 0x204A, + .ReleaseNumber = 0x0000, - ManufacturerStrIndex: NO_DESCRIPTOR, - ProductStrIndex: 0x01, - SerialNumStrIndex: NO_DESCRIPTOR, + .ManufacturerStrIndex = NO_DESCRIPTOR, + .ProductStrIndex = 0x01, + .SerialNumStrIndex = NO_DESCRIPTOR, - NumberOfConfigurations: 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in SRAM memory, describes the usage @@ -71,113 +71,113 @@ USB_Descriptor_Device_t DeviceDescriptor = */ USB_Descriptor_Configuration_t 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: 2, + .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), + .TotalInterfaces = 2, - ConfigurationNumber: 1, - ConfigurationStrIndex: NO_DESCRIPTOR, + .ConfigurationNumber = 1, + .ConfigurationStrIndex = NO_DESCRIPTOR, - ConfigAttributes: (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED), + .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED, - MaxPowerConsumption: USB_CONFIG_POWER_MA(100) + .MaxPowerConsumption = USB_CONFIG_POWER_MA(100) }, - CCI_Interface: + .CCI_Interface = { - Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface}, + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - InterfaceNumber: 0, - AlternateSetting: 0, + .InterfaceNumber = 0, + .AlternateSetting = 0, - TotalEndpoints: 1, + .TotalEndpoints = 1, - Class: 0x02, - SubClass: 0x02, - Protocol: 0x01, + .Class = 0x02, + .SubClass = 0x02, + .Protocol = 0x01, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, - CDC_Functional_IntHeader: + .CDC_Functional_IntHeader = { - Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24}, - SubType: 0x00, + .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, + .SubType = 0x00, - Data: {0x10, 0x01} + .Data = {0x10, 0x01} }, - CDC_Functional_CallManagement: + .CDC_Functional_CallManagement = { - Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24}, - SubType: 0x01, + .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, + .SubType = 0x01, - Data: {0x03, 0x01} + .Data = {0x03, 0x01} }, - CDC_Functional_AbstractControlManagement: + .CDC_Functional_AbstractControlManagement = { - Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), Type: 0x24}, - SubType: 0x02, + .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, + .SubType = 0x02, - Data: {0x06} + .Data = {0x06} }, - CDC_Functional_Union: + .CDC_Functional_Union = { - Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24}, - SubType: 0x06, + .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, + .SubType = 0x06, - Data: {0x00, 0x01} + .Data = {0x00, 0x01} }, - ManagementEndpoint: + .ManagementEndpoint = { - 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 | CDC_NOTIFICATION_EPNUM), - Attributes: EP_TYPE_INTERRUPT, - EndpointSize: CDC_NOTIFICATION_EPSIZE, - PollingIntervalMS: 0x02 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM), + .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = CDC_NOTIFICATION_EPSIZE, + .PollingIntervalMS = 0x02 }, - DCI_Interface: + .DCI_Interface = { - Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface}, + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - InterfaceNumber: 1, - AlternateSetting: 0, + .InterfaceNumber = 1, + .AlternateSetting = 0, - TotalEndpoints: 2, + .TotalEndpoints = 2, - Class: 0x0A, - SubClass: 0x00, - Protocol: 0x00, + .Class = 0x0A, + .SubClass = 0x00, + .Protocol = 0x00, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, - DataOutEndpoint: + .DataOutEndpoint = { - Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint}, + .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, - EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM), - Attributes: EP_TYPE_BULK, - EndpointSize: CDC_TXRX_EPSIZE, - PollingIntervalMS: 0x00 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM), + .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = CDC_TXRX_EPSIZE, + .PollingIntervalMS = 0x00 }, - DataInEndpoint: + .DataInEndpoint = { - 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 | CDC_TX_EPNUM), - Attributes: EP_TYPE_BULK, - EndpointSize: CDC_TXRX_EPSIZE, - PollingIntervalMS: 0x00 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM), + .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = CDC_TXRX_EPSIZE, + .PollingIntervalMS = 0x00 } }; @@ -187,9 +187,9 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = */ USB_Descriptor_String_t 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} }; /** Product descriptor string. This is a Unicode string containing the product's details in human readable form, @@ -198,18 +198,18 @@ USB_Descriptor_String_t LanguageString = */ USB_Descriptor_String_t ProductString = { - Header: {Size: USB_STRING_LEN(15), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String}, - UnicodeString: L"AVR CDC Bootloader" + .UnicodeString = L"AVR CDC Bootloader" }; -/** 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 LUFA 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); @@ -220,22 +220,22 @@ 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: if (!(DescriptorNumber)) { - Address = DESCRIPTOR_ADDRESS(LanguageString); + Address = (void*)&LanguageString; Size = LanguageString.Header.Size; } else { - Address = DESCRIPTOR_ADDRESS(ProductString); + Address = (void*)&ProductString; Size = ProductString.Header.Size; }