Changed per-device controller preprocessor checks over to per-device series for bette...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / USBMode.h

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index 138af9e..471f307 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -42,11 +42,13 @@
                        #endif\r
                        \r
                        #if (defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__))\r
-                               #define USB_LIMITED_CONTROLLER\r
+                               #define USB_SERIES_2_AVR\r
                        #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))\r
-                               #define USB_MODIFIED_FULL_CONTROLLER\r
-                       #else\r
-                               #define USB_FULL_CONTROLLER\r
+                               #define USB_SERIES_4_AVR\r
+                       #elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))\r
+                               #define USB_SERIES_6_AVR\r
+                       #elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__))\r
+                               #define USB_SERIES_7_AVR\r
                        #endif                  \r
 \r
                        #if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY))\r
@@ -61,14 +63,12 @@
                                #define USB_CurrentMode USB_MODE_DEVICE\r
                        #endif\r
                        \r
-                       #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))\r
+                       #if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__)) && defined(USB_HOST_ONLY))\r
+                               #error USB_HOST_ONLY is not available for the currently selected USB AVR model.\r
+                       #elif (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))\r
                                #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.\r
                        #endif\r
 \r
-                       #if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))\r
-                               #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.\r
-                       #endif\r
-\r
                        #if defined(USE_STATIC_OPTIONS)\r
                                #define USB_Options USE_STATIC_OPTIONS\r
                        #endif\r