CI: Build on Arch (bleeding-ege) and Ubuntu (stable) AVR-GCC toolchains.

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

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 8bd4679..6198728 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2018.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -118,7 +118,7 @@
                #elif defined(__AVR_AT90USB82__)
                        #define PRODUCT_ID_CODE               0x2FF7
                        #define AVR_SIGNATURE_1               0x1E
                #elif defined(__AVR_AT90USB82__)
                        #define PRODUCT_ID_CODE               0x2FF7
                        #define AVR_SIGNATURE_1               0x1E

-                       #define AVR_SIGNATURE_2               0x94
+                       #define AVR_SIGNATURE_2               0x93

                        #define AVR_SIGNATURE_3               0x82
                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                        #define AVR_SIGNATURE_3               0x82
                #else
                        #error The selected AVR part is not currently supported by this bootloader.


@@ -186,7 +186,7 @@
 
        /* Function Prototypes: */
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 
        /* Function Prototypes: */
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,

                                                    const void** const DescriptorAddress)
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
                                                    const void** const DescriptorAddress)
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);