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

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

diff --git a/LUFA/Drivers/USB/Core/USBInterrupt.h b/LUFA/Drivers/USB/Core/USBInterrupt.h
index 252ad50..c1a2b62 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBInterrupt.h
+++ b/LUFA/Drivers/USB/Core/USBInterrupt.h
@@ -43,17 +43,29 @@
 \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/USBInterrupt_AVR8.h"\r
-               #elif (ARCH == ARCH_UC3B)\r
-                       #include "UC3B/USBInterrupt_UC3B.h"\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r

                #endif\r
                #endif\r

-               \r
+\r

        /* Preprocessor Checks: */\r
                #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r
        /* Preprocessor Checks: */\r
                #if !defined(__INCLUDE_FROM_USB_DRIVER)\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/USBInterrupt_AVR8.h"\r
+               #elif (ARCH == ARCH_UC3)\r
+                       #include "UC3/USBInterrupt_UC3.h"\r
+               #endif\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r

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