Fixed incorrect comparison in the descriptor callback routine of the TeensyHID bootlo...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.h

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index c20b076..868c3fa 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -28,19 +28,25 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \file\r
+ *  \brief USB device standard request management.\r
+ *\r
+ *  This file contains the function prototypes neccesary for the processing of incomming standard control requests\r
+ *  when the library is in USB device mode.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver\r
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.\r
+ */\r
+\r

 #ifndef __DEVCHAPTER9_H__\r
 #define __DEVCHAPTER9_H__\r
 \r
        /* Includes: */\r
 #ifndef __DEVCHAPTER9_H__\r
 #define __DEVCHAPTER9_H__\r
 \r
        /* Includes: */\r

-               #if defined(__AVR32__)\r
-                       #include <avr32/io.h>\r
-                       #include <stdint.h>\r
-               #elif defined(__AVR__)\r
-                       #include <avr/io.h>\r
-                       #include <avr/pgmspace.h>\r
-                       #include <avr/eeprom.h>\r
-                       #include <avr/boot.h>\r
-               #endif\r
+               #include <avr/io.h>\r
+               #include <avr/pgmspace.h>\r
+               #include <avr/eeprom.h>\r
+               #include <avr/boot.h>\r
+               #include <util/atomic.h>\r

                \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "../HighLevel/Events.h"\r
                \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "../HighLevel/Events.h"\r


@@ -75,11 +81,7 @@
                                enum USB_DescriptorMemorySpaces_t\r
                                {\r
                                        MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory */\r
                                enum USB_DescriptorMemorySpaces_t\r
                                {\r
                                        MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory */\r

-                                       \r
-                                       #if defined(__AVR__) || defined(__DOXYGEN__)\r

                                        MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory */\r
                                        MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory */\r

-                                       #endif\r
-                                       \r

                                        MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory */\r
                                };\r
                        #endif\r
                                        MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory */\r
                                };\r
                        #endif\r


@@ -102,6 +104,7 @@
                                 *\r
                                 *  \note This variable should be treated as read-only in the user application, and never manually\r
                                 *        changed in value.\r
                                 *\r
                                 *  \note This variable should be treated as read-only in the user application, and never manually\r
                                 *        changed in value.\r

+                                *        \n\n\r

                                 *\r
                                 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,\r
                                 *        this global and the underlying management code can be disabled by defining the \r
                                 *\r
                                 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,\r
                                 *        this global and the underlying management code can be disabled by defining the \r


@@ -134,10 +137,6 @@
                #elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS)\r
                        #error Only one of the USE_*_DESCRIPTORS modes should be selected.\r
                #endif\r
                #elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS)\r
                        #error Only one of the USE_*_DESCRIPTORS modes should be selected.\r
                #endif\r

-               \r
-               #if defined(USE_EEPROM_DESCRIPTORS) && defined(USB_SERIES_UC3B_AVR)\r
-                       #error USE_EEPROM_DESCRIPTORS is not available on the UC3B series AVRs.\r
-               #endif\r

        \r
                /* Function Prototypes: */\r
                        void USB_Device_ProcessControlRequest(void);\r
        \r
                /* Function Prototypes: */\r
                        void USB_Device_ProcessControlRequest(void);\r