X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/de0df8b16259458c78c742b5dbedd4ac90856285..refs/heads/master:/Bootloaders/DFU/Descriptors.h diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index b40e0b3d8..1b814325a 100644 --- a/Bootloaders/DFU/Descriptors.h +++ b/Bootloaders/DFU/Descriptors.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2013. + Copyright (C) Dean Camera, 2021. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2021 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 @@ -111,14 +111,14 @@ #define AVR_SIGNATURE_2 0x94 #define AVR_SIGNATURE_3 0x82 #elif defined(__AVR_ATmega8U2__) - #define PRODUCT_ID_CODE 0x2FF7 + #define PRODUCT_ID_CODE 0x2FEE #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x93 #define AVR_SIGNATURE_3 0x89 #elif defined(__AVR_AT90USB82__) - #define PRODUCT_ID_CODE 0x2FEE + #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. @@ -164,9 +164,29 @@ USB_Descriptor_DFU_Functional_t DFU_Functional; } USB_Descriptor_Configuration_t; + /** Enum for the device interface descriptor IDs within the device. Each interface descriptor + * should have a unique ID index associated with it, which can be used to refer to the + * interface from other descriptors. + */ + enum InterfaceDescriptors_t + { + INTERFACE_ID_DFU = 0, /**< DFU interface descriptor ID */ + }; + + /** Enum for the device string descriptor IDs within the device. Each string descriptor should + * have a unique ID index associated with it, which can be used to refer to the string from + * other descriptors. + */ + enum StringDescriptors_t + { + STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */ + STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */ + STRING_ID_Product = 2, /**< Product string ID */ + }; + /* 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);