X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6bda628718f67c04ed43e8328f55bdce5319c504..bea72a8412f99b294c00341fa16a8308bcc66f15:/Bootloaders/DFU/Descriptors.c?ds=inline diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index 4e7272cb7..46cb86835 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -55,7 +55,7 @@ USB_Descriptor_Device_t DeviceDescriptor = .VendorID = 0x03EB, .ProductID = PRODUCT_ID_CODE, - .ReleaseNumber = 0x0000, + .ReleaseNumber = VERSION_BCD(00.00), .ManufacturerStrIndex = NO_DESCRIPTOR, .ProductStrIndex = 0x01, @@ -104,7 +104,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .DFU_Functional = { - .Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional}, + .Header = {.Size = sizeof(USB_Descriptor_DFU_Functional_t), .Type = DTYPE_DFUFunctional}, .Attributes = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD), @@ -145,13 +145,13 @@ USB_Descriptor_String_t ProductString = */ 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) {