Fixed error in PrinterHost preventing the full page data from being sent to the attac...

[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 471f307..ba221c5 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -33,15 +33,9 @@
 \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
                                #define USB_SERIES_4_AVR\r
                                #define USB_SERIES_2_AVR\r
                        #elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))\r
                                #define USB_SERIES_4_AVR\r


@@ -51,27 +45,29 @@
                                #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
+                               #if !defined(USB_DEVICE_ONLY)\r
+                                       #define USB_DEVICE_ONLY\r
+                               #endif\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

-                               #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

-                               #define USB_CurrentMode USB_MODE_DEVICE\r

                        #endif\r
                        \r
                        #endif\r
                        \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
+                       #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))\r

                                #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.\r
                        #endif\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