Pipe_GetErrorFlags() now returns additional error flags for overflow and underflow...

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

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index e90d397..9abd275 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -33,19 +33,44 @@
  *  Master include file for the library USB functionality. This file should be included in all user projects making\r
  *  use of the USB portions of the library, instead of including any headers in the USB/LowLevel or USB/HighLevel\r
  *  directories.\r
  *  Master include file for the library USB functionality. This file should be included in all user projects making\r
  *  use of the USB portions of the library, instead of including any headers in the USB/LowLevel or USB/HighLevel\r
  *  directories.\r

+ */\r
+\r
+/** @defgroup Group_USB USB - LUFA/Drivers/USB/USB.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/LowLevel/DevChapter9.c\r
+ *    - LUFA/Drivers/USB/LowLevel/Endpoint.c\r
+ *    - LUFA/Drivers/USB/LowLevel/Host.c\r
+ *    - LUFA/Drivers/USB/LowLevel/HostChapter9.c\r
+ *    - LUFA/Drivers/USB/LowLevel/LowLevel.c\r
+ *    - LUFA/Drivers/USB/LowLevel/Pipe.c\r
+ *    - LUFA/Drivers/USB/HighLevel/Events.c\r
+ *    - LUFA/Drivers/USB/HighLevel/USBInterrupt.c\r
+ *    - LUFA/Drivers/USB/HighLevel/USBTask.c\r
+ *    - LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c\r

  *\r
  *\r

- *  Class specific utility files in USB/Class/ must still be included manually, as they are not normally part of\r
- *  the USB library unless desired by the library user.\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB communications.\r

  */\r
 \r
  */\r
 \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_USBClassDrivers USB Class Drivers\r
+ *\r
+ *  Drivers for both host and device mode of the standard USB classes, for rapid application development.\r
+ *  Class drivers give a framework which sits on top of the low level library API, allowing for standard\r
+ *  USB classes to be implemented in a project with minimal user code. These drivers can be used in\r
+ *  conjunction with the library low level APIs to implement interfaces both via the class drivers and via\r
+ *  the standard library APIs.\r
+ *\r
+ *  Multiple device mode class drivers can be used within a project, including multiple instances of the\r
+ *  same class driver.\r
+ */\r
+ \r

 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r
 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r

-       /* Preprocessor Checks: */\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
-               #endif\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
                #if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) ||  \\r
                       defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) ||  \\r
                           defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__)  ||  \\r


@@ -55,7 +80,13 @@
                #endif\r
                \r
        /* Includes: */\r
                #endif\r
                \r
        /* Includes: */\r

-               #include "LowLevel/USBMode.h"\r
+               #include "HighLevel/USBMode.h"\r
+               #include "HighLevel/USBTask.h"\r
+               #include "HighLevel/USBInterrupt.h"\r
+               #include "HighLevel/Events.h"\r
+               #include "HighLevel/StdDescriptors.h"\r
+\r
+               #include "LowLevel/LowLevel.h"\r

        \r
                #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)\r
                        #include "LowLevel/Host.h"\r
        \r
                #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)\r
                        #include "LowLevel/Host.h"\r


@@ -72,12 +103,8 @@
                #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)\r
                        #include "LowLevel/OTG.h"\r
                #endif\r
                #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)\r
                        #include "LowLevel/OTG.h"\r
                #endif\r

-\r
-               #include "LowLevel/LowLevel.h"\r
-               #include "HighLevel/USBTask.h"\r
-               #include "HighLevel/USBInterrupt.h"\r
-               #include "HighLevel/Events.h"\r
-               #include "HighLevel/StdDescriptors.h"\r
+               \r
+               #include "HighLevel/ConfigDescriptor.h"\r

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