Added CPU Usage monitor host app to the LEDNotifier project.

[pub/USBasp.git] / Bootloaders / DFU / Descriptors.c

diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c
index cff3cd5..eb5c580 100644 (file)
--- a/Bootloaders/DFU/Descriptors.c
+++ b/Bootloaders/DFU/Descriptors.c
@@ -61,7 +61,7 @@ USB_Descriptor_Device_t DeviceDescriptor =
        .ProductStrIndex        = 0x01,\r
        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r
        .ProductStrIndex        = 0x01,\r
        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r

-       .NumberOfConfigurations = 1\r
+       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r

 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r


@@ -108,7 +108,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        \r
                        .Attributes             = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD),\r
 \r
                        \r
                        .Attributes             = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD),\r
 \r

-                       .DetatchTimeout         = 0x0000,\r
+                       .DetachTimeout          = 0x0000,\r

                        .TransferSize           = 0x0c00,\r
                \r
                        .DFUSpecification       = VERSION_BCD(01.01)\r
                        .TransferSize           = 0x0c00,\r
                \r
                        .DFUSpecification       = VERSION_BCD(01.01)\r


@@ -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\r
  *  USB host.\r
  */\r
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\r

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r

 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r