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 b9b506f..0d0a3f7 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -54,6 +54,15 @@
  *  Driver and framework for the USB controller hardware on the USB series of AVR microcontrollers. This module\r
  *  consists of many submodules, and is designed to provide an easy way to configure and control USB host, device\r
  *  or OTG mode USB applications.\r
+ *\r
+ *  The USB stack requires the sole control over the USB controller in the microcontroller only; i.e. it does not\r
+ *  require any additional AVR timers, etc. to operate. This ensures that the USB stack requires as few resources\r
+ *  as possible.\r
+ *\r
+ *  The USB stack can be used in Device Mode for connections to USB Hosts (see \ref Group_Device), in Host mode for\r
+ *  hosting of other USB devices (see \ref Group_Host), or as a dual role device which can either act as a USB host\r
+ *  or device depending on what peripheral is connected (see \ref Group_OTG). Both modes also require a common set\r
+ *  of USB management functions found \ref Group_USBManagement.\r
  */\r
 \r
 /** \ingroup Group_USB\r
@@ -74,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
@@ -104,13 +113,13 @@
  *  </tr>\r
  *  <tr>\r
  *   <td>Printer</td>\r
- *   <td bgcolor="#00EE00">Yes</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">No</td>\r
+ *   <td bgcolor="#00EE00">Yes</td>\r
  *  </tr>\r
  *  <tr>\r
  *   <td>Still Image</td>\r
@@ -123,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