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

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

diff --git a/LUFA/Drivers/USB/Core/OTG.h b/LUFA/Drivers/USB/Core/OTG.h
index 3b41a0f..69caa7c 100644 (file)
--- a/LUFA/Drivers/USB/Core/OTG.h
+++ b/LUFA/Drivers/USB/Core/OTG.h
@@ -29,10 +29,8 @@
 */\r
 \r
 /** \file\r
 */\r
 \r
 /** \file\r

- *  \brief USB OTG mode definitions.\r
- *\r
- *  This file contains structures, function prototypes and macros related to USB OTG mode, where two USB devices\r
- *  may be linked directly together and exchange host/device roles as needed.\r
+ *  \brief Common USB OTG definitions for all architectures.\r
+ *  \copydetails Group_OTG\r

  *\r
  *  \note This file should not be included directly. It is automatically included as needed by the USB driver\r
  *        dispatch header located in LUFA/Drivers/USB/USB.h.\r
  *\r
  *  \note This file should not be included directly. It is automatically included as needed by the USB driver\r
  *        dispatch header located in LUFA/Drivers/USB/USB.h.\r


@@ -40,6 +38,7 @@
 \r
 /** \ingroup Group_USB\r
  *  \defgroup Group_OTG USB On The Go (OTG) Management\r
 \r
 /** \ingroup Group_USB\r
  *  \defgroup Group_OTG USB On The Go (OTG) Management\r

+ *  \brief USB OTG management definitions.\r

  *\r
  *  This module contains macros for embedded USB hosts with dual role On The Go capabilities, for managing role\r
  *  exchange. OTG is a way for two USB dual role devices to talk to one another directly without fixed device/host\r
  *\r
  *  This module contains macros for embedded USB hosts with dual role On The Go capabilities, for managing role\r
  *  exchange. OTG is a way for two USB dual role devices to talk to one another directly without fixed device/host\r


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

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

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


@@ -63,6 +64,16 @@
                        #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/OTG_AVR8.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