Speed up bit-banged USART code in the AVRISP project.

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

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index f1d7d5b..0d0a3f7 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -83,8 +83,8 @@
  *  <table>\r
  *  <tr>\r
  *   <th width="100px">USB Class</th> \r
- *   <th width="80px">Device</th> \r
- *   <th width="80px">Host</th> \r
+ *   <th width="90px">Device Mode</th> \r
+ *   <th width="90px">Host Mode</th> \r
  *  </tr>\r
  *  <tr>\r
  *   <td>Audio</td>\r
@@ -113,13 +113,13 @@
  *  </tr>\r
  *  <tr>\r
  *   <td>Printer</td>\r
- *   <td bgcolor="#00EE00">No</td>\r
+ *   <td bgcolor="#EE0000">No</td>\r
 *    <td bgcolor="#00EE00">Yes</td>\r
  *  </tr>\r
  *  <tr>\r
  *   <td>RNDIS</td>\r
  *   <td bgcolor="#00EE00">Yes</td>\r
- *   <td bgcolor="#EE0000">Yes</td>\r
+ *   <td bgcolor="#00EE00">Yes</td>\r
  *  </tr>\r
  *  <tr>\r
  *   <td>Still Image</td>\r
@@ -132,19 +132,16 @@
 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r
+       /* Includes: */\r
+               #include "HighLevel/USBMode.h"\r
+\r
        /* Preprocessor Checks: */              \r
-               #if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) ||  \\r
-                      defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) ||  \\r
-                          defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__)  ||  \\r
-                          defined(__AVR_ATmega32U2__)  || defined(__AVR_ATmega16U2__) ||  \\r
-                          defined(__AVR_ATmega8U2__)   ||                                 \\r
-                          defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) ||  \\r
-                          defined(__AVR_ATmega32U6__)))\r
+               #if (!defined(USB_SERIES_2_AVR) && !defined(USB_SERIES_4_AVR) && \\r
+                    !defined(USB_SERIES_6_AVR) && !defined(USB_SERIES_7_AVR))\r
                        #error The currently selected AVR model is not supported under the USB component of the LUFA library.\r
                #endif\r
                \r
        /* Includes: */\r
-               #include "HighLevel/USBMode.h"\r
                #include "HighLevel/USBTask.h"\r
                #include "HighLevel/USBInterrupt.h"\r
                #include "HighLevel/Events.h"\r