Revert changes made for the partial port to the AVR32 architecture.

[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..58a5dc8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -32,15 +32,10 @@
 #define __DEVCHAPTER9_H__\r
 \r
        /* Includes: */\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

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


@@ -55,7 +50,7 @@
 \r
        /* Preprocessor Checks: */\r
                #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
 \r
        /* Preprocessor Checks: */\r
                #if !defined(__INCLUDE_FROM_USB_DRIVER)\r

-                       #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r

                #endif\r
                \r
        /* Public Interface - May be used in end-application: */\r
                #endif\r
                \r
        /* Public Interface - May be used in end-application: */\r


@@ -75,11 +70,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


@@ -134,10 +125,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