Replace blind interface descriptor search in the incomplete AndroidAccessoryHost...

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

diff --git a/LUFA/Drivers/USB/Core/USBController.h b/LUFA/Drivers/USB/Core/USBController.h
index dfd2ce1..ac3b9ca 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBController.h
+++ b/LUFA/Drivers/USB/Core/USBController.h
@@ -38,7 +38,7 @@
 \r
 /** \ingroup Group_USB\r
  *  \defgroup Group_USBManagement USB Interface Management\r
 \r
 /** \ingroup Group_USB\r
  *  \defgroup Group_USBManagement USB Interface Management\r

- *  \brief Common USB Controller definitions for all architectures.\r
+ *  \brief USB Controller definitions for general USB controller management.\r

  *\r
  *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.\r
  *\r
  *\r
  *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.\r
  *\r


@@ -50,9 +50,11 @@
 \r
        /* Includes: */\r
                #include "../../../Common/Common.h"\r
 \r
        /* Includes: */\r
                #include "../../../Common/Common.h"\r

+               #include "USBMode.h"            \r

 \r
 \r

-               #if (ARCH == ARCH_AVR8)\r
-                       #include "AVR8/USBController.h"\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r

                #endif\r
 \r
        /* Preprocessor Checks and Defines: */\r
                #endif\r
 \r
        /* Preprocessor Checks and Defines: */\r


@@ -60,6 +62,18 @@
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r

+       /* Architecture Includes: */\r
+               #if (ARCH == ARCH_AVR8)\r
+                       #include "AVR8/USBController_AVR8.h"\r
+               #elif (ARCH == ARCH_UC3)\r
+                       #include "UC3/USBController_UC3.h"      \r
+               #endif\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r

 #endif\r
 \r
 /** @} */\r
 #endif\r
 \r
 /** @} */\r