X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/72c2922e38a2dfd14eb2d8e3692171704b5508f4..04774208b6d4131466a2b5e44af314252ab1734e:/Bootloaders/DFU/Descriptors.c?ds=sidebyside diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index cff3cd523..eb5c580b0 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -61,7 +61,7 @@ USB_Descriptor_Device_t DeviceDescriptor = .ProductStrIndex = 0x01, .SerialNumStrIndex = NO_DESCRIPTOR, - .NumberOfConfigurations = 1 + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage @@ -108,7 +108,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .Attributes = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD), - .DetatchTimeout = 0x0000, + .DetachTimeout = 0x0000, .TransferSize = 0x0c00, .DFUSpecification = VERSION_BCD(01.01) @@ -143,7 +143,7 @@ USB_Descriptor_String_t ProductString = * 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);