Update Mass Storage bootloader for Linux compatibility, and to reduce the compiled...

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

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 21c5da7..71ae30a 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -39,6 +39,8 @@
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 
+               #include "Config/AppConfig.h"
+
        /* Macros: */
                /** Descriptor type value for a DFU class functional descriptor. */
                #define DTYPE_DFUFunctional               0x21
@@ -83,11 +85,6 @@
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x96
                        #define AVR_SIGNATURE_3               0x82
-               #elif defined(__AVR_ATmega32U6__)
-                       #define PRODUCT_ID_CODE               0x2FFB
-                       #define AVR_SIGNATURE_1               0x1E
-                       #define AVR_SIGNATURE_2               0x95
-                       #define AVR_SIGNATURE_3               0x88
                #elif defined(__AVR_ATmega32U4__)
                        #define PRODUCT_ID_CODE               0x2FF4
                        #define AVR_SIGNATURE_1               0x1E
@@ -114,15 +111,15 @@
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x82
                #elif defined(__AVR_ATmega8U2__)
-                       #define PRODUCT_ID_CODE               0x2FF7
-                       #define AVR_SIGNATURE_1               0x1E
-                       #define AVR_SIGNATURE_2               0x93
-                       #define AVR_SIGNATURE_3               0x82
-               #elif defined(__AVR_AT90USB82__)
                        #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               0x2FF7
+                       #define AVR_SIGNATURE_1               0x1E
+                       #define AVR_SIGNATURE_2               0x94
+                       #define AVR_SIGNATURE_3               0x82
                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif
@@ -137,21 +134,21 @@
                 */
                typedef struct
                {
-                       USB_Descriptor_Header_t               Header; /**< Standard descriptor header structure */
-
-                       uint8_t                               Attributes; /**< DFU device attributes, a mask comprising of the
-                                                                          *  ATTR_* macros listed in this source file
-                                                                          */
-                       uint16_t                              DetachTimeout; /**< Timeout in milliseconds between a USB_DETACH
-                                                                              *  command being issued and the device detaching
-                                                                              *  from the USB bus
-                                                                              */
-                       uint16_t                              TransferSize; /**< Maximum number of bytes the DFU device can accept
-                                                                            *  from the host in a transaction
-                                                                            */
-                       uint16_t                              DFUSpecification; /**< BCD packed DFU specification number this DFU
-                                                                                *  device complies with
-                                                                                */
+                       USB_Descriptor_Header_t Header; /**< Standard descriptor header structure */
+
+                       uint8_t                 Attributes; /**< DFU device attributes, a mask comprising of the
+                                                            *  ATTR_* macros listed in this source file
+                                                            */
+                       uint16_t                DetachTimeout; /**< Timeout in milliseconds between a USB_DETACH
+                                                               *  command being issued and the device detaching
+                                                               *  from the USB bus
+                                                               */
+                       uint16_t                TransferSize; /**< Maximum number of bytes the DFU device can accept
+                                                              *  from the host in a transaction
+                                                              */
+                       uint16_t                DFUSpecification; /**< BCD packed DFU specification number this DFU
+                                                                  *  device complies with
+                                                                  */
                } USB_Descriptor_DFU_Functional_t;
 
                /** Type define for the device configuration descriptor structure. This must be defined in the
@@ -161,6 +158,8 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config;
+
+                       // DFU Interface
                        USB_Descriptor_Interface_t            DFU_Interface;
                        USB_Descriptor_DFU_Functional_t       DFU_Functional;
                } USB_Descriptor_Configuration_t;