Cleanup USBMode.h to simplify preprocessor logic.

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index 8664c1b..18a2666 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -33,15 +33,8 @@
 \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
 \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r

-               /* Macros: */\r
-                       #if ((defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) ||   \\r
-                             defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__)  ||   \\r
-                                 defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) ||   \\r
-                                 defined(__AVR_ATmega32U6__)) && !defined(USB_DEVICE_ONLY))\r
-                               #define USB_DEVICE_ONLY\r
-                       #endif\r
-                       \r
-                       #if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \\r
+               /* Macros: */                   \r
+                       #if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__)  || \\r

                             defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))\r
                                #define USB_SERIES_2_AVR\r
                        #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))\r
                             defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))\r
                                #define USB_SERIES_2_AVR\r
                        #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))\r


@@ -52,31 +45,27 @@
                                #define USB_SERIES_7_AVR\r
                        #endif                  \r
 \r
                                #define USB_SERIES_7_AVR\r
                        #endif                  \r
 \r

+                       #if !defined(USB_SERIES_7_AVR)          \r
+                               #if defined(USB_HOST_ONLY)\r
+                                       #error USB_HOST_ONLY is not available for the currently selected USB AVR model.\r
+                               #endif\r
+                               \r
+                               #define USB_DEVICE_ONLY\r
+                       #endif\r
+\r

                        #if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY))\r
                                #define USB_CAN_BE_BOTH\r
                                #define USB_CAN_BE_HOST\r
                                #define USB_CAN_BE_DEVICE\r
                        #elif defined(USB_HOST_ONLY)\r
                                #define USB_CAN_BE_HOST\r
                        #if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY))\r
                                #define USB_CAN_BE_BOTH\r
                                #define USB_CAN_BE_HOST\r
                                #define USB_CAN_BE_DEVICE\r
                        #elif defined(USB_HOST_ONLY)\r
                                #define USB_CAN_BE_HOST\r

-\r
-                               #define USB_CurrentMode USB_MODE_HOST\r

                        #elif defined(USB_DEVICE_ONLY)\r
                                #define USB_CAN_BE_DEVICE\r
                        #elif defined(USB_DEVICE_ONLY)\r
                                #define USB_CAN_BE_DEVICE\r

-\r
-                               #define USB_CurrentMode USB_MODE_DEVICE\r
-                       #endif\r
-                       \r
-                       #if (!defined(USB_SERIES_7_AVR) && defined(USB_HOST_ONLY))\r
-                               #error USB_HOST_ONLY is not available for the currently selected USB AVR model.\r

                        #endif\r
                        \r
                        #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))\r
                                #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.\r
                        #endif\r
                        #endif\r
                        \r
                        #if (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_STATIC_OPTIONS)\r
-                               #define USB_Options USE_STATIC_OPTIONS\r
-                       #endif\r

        #endif\r
        \r
 #endif\r
        #endif\r
        \r
 #endif\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index ca2fc7b..1ca54ed 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -301,6 +301,10 @@
                                 *        changed in value.\r
                                 */\r
                                extern volatile uint8_t USB_CurrentMode;\r
                                 *        changed in value.\r
                                 */\r
                                extern volatile uint8_t USB_CurrentMode;\r

+                       #elif defined(USB_HOST_ONLY)\r
+                               #define USB_CurrentMode USB_MODE_HOST\r
+                       #elif defined(USB_DEVICE_ONLY)\r
+                               #define USB_CurrentMode USB_MODE_DEVICE\r

                        #endif\r
                        \r
                        #if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)\r
                        #endif\r
                        \r
                        #if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)\r


@@ -311,6 +315,8 @@
                                 *        changed in value.\r
                                 */\r
                                extern volatile uint8_t USB_Options;\r
                                 *        changed in value.\r
                                 */\r
                                extern volatile uint8_t USB_Options;\r

+                       #elif defined(USE_STATIC_OPTIONS)\r
+                               #define USB_Options USE_STATIC_OPTIONS\r

                        #endif\r
 \r
        /* Private Interface - For use in library only: */\r
                        #endif\r
 \r
        /* Private Interface - For use in library only: */\r