Update version for the 140302 release.

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

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 3ba6f38..a8df26f 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2014.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -39,24 +39,26 @@
 
 /** \defgroup Group_USB USB Core - LUFA/Drivers/USB/USB.h
  *
 
 /** \defgroup Group_USB USB Core - LUFA/Drivers/USB/USB.h
  *

- *  \section Sec_Dependencies Module Source Dependencies
+ *  \brief Core driver for the microcontroller hardware USB module
+ *
+ *  \section Sec_USB_Dependencies Module Source Dependencies

  *  The following files must be built with any user project that uses this module:
  *  The following files must be built with any user project that uses this module:

- *    - LUFA/Drivers/USB/Core/ConfigDescriptor.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/ConfigDescriptors.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

  *    - LUFA/Drivers/USB/Core/DeviceStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/Events.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/DeviceStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/Events.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

- *    - LUFA/Drivers/USB/Core/EndpointStream.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

  *    - LUFA/Drivers/USB/Core/HostStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/HostStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

- *    - LUFA/Drivers/USB/Core/PipeStream.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

  *    - LUFA/Drivers/USB/Core/USBTask.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Device_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Endpoint_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/USBTask.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Device_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Endpoint_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/EndpointStream_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Host_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Pipe_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Host_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Pipe_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/PipeStream_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>

  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBController_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBInterrupt_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Class/Common/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBController_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBInterrupt_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Class/Common/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *

- *  \section Sec_ModDescription Module Description
+ *  \section Sec_USB_ModDescription Module Description

  *  Driver and framework for the USB controller of the selected architecture and microcontroller model. This module
  *  consists of many submodules, and is designed to provide an easy way to configure and control USB host, device
  *  or OTG mode USB applications.
  *  Driver and framework for the USB controller of the selected architecture and microcontroller model. This module
  *  consists of many submodules, and is designed to provide an easy way to configure and control USB host, device
  *  or OTG mode USB applications.


@@ -73,6 +75,8 @@
 
 /** \defgroup Group_USBClassDrivers USB Class Drivers
  *
 
 /** \defgroup Group_USBClassDrivers USB Class Drivers
  *

+ *  \brief Drivers for the various standardized USB device classes
+ *

  *  Drivers for both host and device mode of the standard USB classes, for rapid application development.
  *  Class drivers give a framework which sits on top of the low level library API, allowing for standard
  *  USB classes to be implemented in a project with minimal user code. These drivers can be used in
  *  Drivers for both host and device mode of the standard USB classes, for rapid application development.
  *  Class drivers give a framework which sits on top of the low level library API, allowing for standard
  *  USB classes to be implemented in a project with minimal user code. These drivers can be used in


@@ -87,17 +91,22 @@
  *
  *  <table>
  *  <tr>
  *
  *  <table>
  *  <tr>

- *   <th width="100px">USB Class</th>
+ *   <th width="200px">USB Class</th>

  *   <th width="90px">Device Mode</th>
  *   <th width="90px">Host Mode</th>
  *  </tr>
  *  <tr>
  *   <th width="90px">Device Mode</th>
  *   <th width="90px">Host Mode</th>
  *  </tr>
  *  <tr>

- *   <td>Audio</td>
- *   <td bgcolor="#00EE00">Yes</td>
+ *   <td>Android Open Accessory</td>

  *   <td bgcolor="#EE0000">No</td>
  *   <td bgcolor="#EE0000">No</td>

+ *   <td bgcolor="#00EE00">Yes</td>
+ *  </tr>
+ *  <tr>
+ *   <td>Audio 1.0</td>
+ *   <td bgcolor="#00EE00">Yes</td>
+ *   <td bgcolor="#00EE00">Yes</td>

  *  </tr>
  *  <tr>
  *  </tr>
  *  <tr>

- *   <td>CDC</td>
+ *   <td>CDC-ACM</td>

  *   <td bgcolor="#00EE00">Yes</td>
  *   <td bgcolor="#00EE00">Yes</td>
  *  </tr>
  *   <td bgcolor="#00EE00">Yes</td>
  *   <td bgcolor="#00EE00">Yes</td>
  *  </tr>


@@ -118,8 +127,8 @@
  *  </tr>
  *  <tr>
  *   <td>Printer</td>
  *  </tr>
  *  <tr>
  *   <td>Printer</td>

- *   <td bgcolor="#EE0000">No</td>
-*    <td bgcolor="#00EE00">Yes</td>
+ *   <td bgcolor="#00EE00">Yes</td>
+ *   <td bgcolor="#00EE00">Yes</td>

  *  </tr>
  *  <tr>
  *   <td>RNDIS</td>
  *  </tr>
  *  <tr>
  *   <td>RNDIS</td>


@@ -134,13 +143,13 @@
  *  </table>
  *
  *
  *  </table>
  *
  *

- *  \section Sec_UsingClassDrivers Using the Class Drivers
+ *  \section Sec_USB_UsingClassDrivers Using the Class Drivers

  *  To make the Class drivers easy to integrate into a user application, they all implement a standardized
  *  design with similarly named/used function, enums, defines and types. The two different modes are implemented
  *  slightly differently, and thus will be explained separately. For information on a specific class driver, read
  *  the class driver's module documentation.
  *
  *  To make the Class drivers easy to integrate into a user application, they all implement a standardized
  *  design with similarly named/used function, enums, defines and types. The two different modes are implemented
  *  slightly differently, and thus will be explained separately. For information on a specific class driver, read
  *  the class driver's module documentation.
  *

- *  \subsection Sec_ClassDriverDevice Device Mode Class Drivers
+ *  \subsection Sec_USB_ClassDriverDevice Device Mode Class Drivers

  *  Implementing a Device Mode Class Driver in a user application requires a number of steps to be followed. Firstly,
  *  the module configuration and state structure must be added to the project source. These structures are named in a
  *  similar manner between classes, that of <tt>USB_ClassInfo_<i>{Class Name}</i>_Device_t</tt>, and are used to hold the
  *  Implementing a Device Mode Class Driver in a user application requires a number of steps to be followed. Firstly,
  *  the module configuration and state structure must be added to the project source. These structures are named in a
  *  similar manner between classes, that of <tt>USB_ClassInfo_<i>{Class Name}</i>_Device_t</tt>, and are used to hold the


@@ -153,9 +162,6 @@
  *  before the class driver is used. Each Device mode Class driver typically contains a set of configuration parameters
  *  for the endpoint size/number of the associated logical USB interface, plus any class-specific configuration parameters.
  *
  *  before the class driver is used. Each Device mode Class driver typically contains a set of configuration parameters
  *  for the endpoint size/number of the associated logical USB interface, plus any class-specific configuration parameters.
  *

- *  The \c State section of the \c USB_ClassInfo_* structures are designed to be controlled by the Class Drivers only for
- *  maintaining the Class Driver instance's state, and should not normally be set by the user application.
- *

  *  The following is an example of a properly initialized instance of the Audio Class Driver structure:
  *
  *  \code
  *  The following is an example of a properly initialized instance of the Audio Class Driver structure:
  *
  *  \code


@@ -164,9 +170,12 @@
  *      .Config =
  *          {
  *              .StreamingInterfaceNumber = 1,
  *      .Config =
  *          {
  *              .StreamingInterfaceNumber = 1,

- *
- *              .DataINEndpointNumber     = 1,
- *              .DataINEndpointSize       = 256,
+ *              .DataINEndpoint           =
+ *                  {
+ *                      .Address          = (ENDPOINT_DIR_IN | 1),
+ *                      .Size             = 64,
+ *                      .Banks            = 1,
+ *                  },

  *          },
  *  };
  *  \endcode
  *          },
  *  };
  *  \endcode


@@ -176,17 +185,17 @@
  *
  *  To initialize the Class driver instance, the driver's <tt><i>{Class Name}</i>_Device_ConfigureEndpoints()</tt> function
  *  should be called in response to the \ref EVENT_USB_Device_ConfigurationChanged() event. This function will return a
  *
  *  To initialize the Class driver instance, the driver's <tt><i>{Class Name}</i>_Device_ConfigureEndpoints()</tt> function
  *  should be called in response to the \ref EVENT_USB_Device_ConfigurationChanged() event. This function will return a

- *  boolean value if the driver successfully initialized the instance. Like all the class driver functions, this function
+ *  boolean true value if the driver successfully initialized the instance. Like all the class driver functions, this function

  *  takes in the address of the specific instance you wish to initialize - in this manner, multiple separate instances of
  *  the same class type can be initialized like this:
  *
  *  \code
  *  void EVENT_USB_Device_ConfigurationChanged(void)
  *  {
  *  takes in the address of the specific instance you wish to initialize - in this manner, multiple separate instances of
  *  the same class type can be initialized like this:
  *
  *  \code
  *  void EVENT_USB_Device_ConfigurationChanged(void)
  *  {

- *     LEDs_SetAllLEDs(LEDMASK_USB_READY);
+ *      LEDs_SetAllLEDs(LEDMASK_USB_READY);

  *
  *

- *     if (!(Audio_Device_ConfigureEndpoints(&My_Audio_Interface)))
- *       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+ *      if (!(Audio_Device_ConfigureEndpoints(&My_Audio_Interface)))
+ *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

  *  }
  *  \endcode
  *
  *  }
  *  \endcode
  *


@@ -205,7 +214,8 @@
  *
  *      for (;;)
  *      {
  *
  *      for (;;)
  *      {

- *          Create_And_Process_Samples();
+ *          if (USB_DeviceState != DEVICE_STATE_Configured)
+ *            Create_And_Process_Samples();

  *
  *          Audio_Device_USBTask(&My_Audio_Interface);
  *          USB_USBTask();
  *
  *          Audio_Device_USBTask(&My_Audio_Interface);
  *          USB_USBTask();


@@ -239,7 +249,7 @@
  *  read and write routines. See each driver's individual documentation for more information on the
  *  class-specific functions.
  *
  *  read and write routines. See each driver's individual documentation for more information on the
  *  class-specific functions.
  *

- *  \subsection Sec_ClassDriverHost Host Mode Class Drivers
+ *  \subsection Sec_USB_ClassDriverHost Host Mode Class Drivers

  *  Implementing a Host Mode Class Driver in a user application requires a number of steps to be followed. Firstly,
  *  the module configuration and state structure must be added to the project source. These structures are named in a
  *  similar manner between classes, that of <tt>USB_ClassInfo_<b>{Class Name}</b>_Host_t</tt>, and are used to hold the
  *  Implementing a Host Mode Class Driver in a user application requires a number of steps to be followed. Firstly,
  *  the module configuration and state structure must be added to the project source. These structures are named in a
  *  similar manner between classes, that of <tt>USB_ClassInfo_<b>{Class Name}</b>_Host_t</tt>, and are used to hold the


@@ -252,27 +262,31 @@
  *  before the class driver is used. Each Device mode Class driver typically contains a set of configuration parameters
  *  for the endpoint size/number of the associated logical USB interface, plus any class-specific configuration parameters.
  *
  *  before the class driver is used. Each Device mode Class driver typically contains a set of configuration parameters
  *  for the endpoint size/number of the associated logical USB interface, plus any class-specific configuration parameters.
  *

- *  The \c State section of the \c USB_ClassInfo_* structures are designed to be controlled by the Class Drivers only for
- *  maintaining the Class Driver instance's state, and should not normally be set by the user application.
- *
- *  The following is an example of a properly initialized instance of the MIDI Class Driver structure:
+ *  The following is an example of a properly initialized instance of the MIDI Host Class Driver structure:

  *
  *  \code
  *  USB_ClassInfo_MIDI_Host_t My_MIDI_Interface =
  *  {
  *      .Config =
  *          {
  *
  *  \code
  *  USB_ClassInfo_MIDI_Host_t My_MIDI_Interface =
  *  {
  *      .Config =
  *          {

- *              .DataINPipeNumber       = 1,
- *              .DataINPipeDoubleBank   = false,
- *
- *              .DataOUTPipeNumber      = 2,
- *              .DataOUTPipeDoubleBank  = false,
+ *              .DataINPipe             =
+ *                  {
+ *                      .Address        = (PIPE_DIR_IN  | 1),
+ *                      .Size           = 64,
+ *                      .Banks          = 1,
+ *                  },
+ *              .DataOUTPipe            =
+ *                  {
+ *                      .Address        = (PIPE_DIR_OUT | 2),
+ *                      .Size           = 64,
+ *                      .Banks          = 1,
+ *                  },

  *          },
  *  };
  *  \endcode
  *
  *  To initialize the Class driver instance, the driver's <tt><b>{Class Name}</b>_Host_ConfigurePipes()</tt> function
  *          },
  *  };
  *  \endcode
  *
  *  To initialize the Class driver instance, the driver's <tt><b>{Class Name}</b>_Host_ConfigurePipes()</tt> function

- *  should be called in response to the host state machine entering the \ref HOST_STATE_Addressed state. This function
+ *  should be called in response to the \c EVENT_USB_Host_DeviceEnumerationComplete() event firing. This function will

  *  will return an error code from the class driver's <tt><b>{Class Name}</b>_EnumerationFailure_ErrorCodes_t</tt> enum
  *  to indicate if the driver successfully initialized the instance and bound it to an interface in the attached device.
  *  Like all the class driver functions, this function takes in the address of the specific instance you wish to initialize -
  *  will return an error code from the class driver's <tt><b>{Class Name}</b>_EnumerationFailure_ErrorCodes_t</tt> enum
  *  to indicate if the driver successfully initialized the instance and bound it to an interface in the attached device.
  *  Like all the class driver functions, this function takes in the address of the specific instance you wish to initialize -


@@ -280,40 +294,48 @@
  *  based Host mode application may look like the following:
  *
  *  \code
  *  based Host mode application may look like the following:
  *
  *  \code

- *      switch (USB_HostState)
+ *  void EVENT_USB_Host_DeviceEnumerationComplete(void)
+ *  {
+ *      LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+ *
+ *      uint16_t ConfigDescriptorSize;
+ *      uint8_t  ConfigDescriptorData[512];
+ *
+ *      if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
+ *                                             sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
+ *      {
+ *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+ *          return;
+ *      }
+ *
+ *      if (MIDI_Host_ConfigurePipes(&Keyboard_MIDI_Interface,
+ *                                   ConfigDescriptorSize, ConfigDescriptorData) != MIDI_ENUMERROR_NoError)

  *      {
  *      {

- *          case HOST_STATE_Addressed:
- *              LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
- *
- *              uint16_t ConfigDescriptorSize;
- *              uint8_t  ConfigDescriptorData[512];
- *
- *              if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
- *                                                     sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
- *              {
- *                  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
- *                  USB_HostState = HOST_STATE_WaitForDeviceRemoval;
- *                  break;
- *              }
- *
- *              if (MIDI_Host_ConfigurePipes(&My_MIDI_Interface,
- *                                           ConfigDescriptorSize, ConfigDescriptorData) != MIDI_ENUMERROR_NoError)
- *              {
- *                  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
- *                  USB_HostState = HOST_STATE_WaitForDeviceRemoval;
- *                  break;
- *              }
- *
- *              // Other state handler code here
+ *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+ *          return;
+ *      }
+ *
+ *      if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
+ *      {
+ *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+ *          return;
+ *      }
+ *
+ *      LEDs_SetAllLEDs(LEDMASK_USB_READY);
+ *  }

  *  \endcode
  *
  *  \endcode
  *

- *  Note that the function also required the device's configuration descriptor so that it can determine which interface
+ *  Note that the function also requires the device's configuration descriptor so that it can determine which interface

  *  in the device to bind to - this can be retrieved as shown in the above fragment using the
  *  \ref USB_Host_GetDeviceConfigDescriptor() function. If the device does not implement the interface the class driver
  *  is looking for, if all the matching interfaces are already bound to class driver instances or if an error occurs while
  *  binding to a device interface (for example, a device endpoint bank larger that the maximum supported bank size is used)
  *  the configuration will fail.
  *
  *  in the device to bind to - this can be retrieved as shown in the above fragment using the
  *  \ref USB_Host_GetDeviceConfigDescriptor() function. If the device does not implement the interface the class driver
  *  is looking for, if all the matching interfaces are already bound to class driver instances or if an error occurs while
  *  binding to a device interface (for example, a device endpoint bank larger that the maximum supported bank size is used)
  *  the configuration will fail.
  *

+ *  To complete the device enumeration after binding the host mode Class Drivers to the attached device, a call to
+ *  \c USB_Host_SetDeviceConfiguration() must be made. If the device configuration is not set within the
+ *  \c EVENT_USB_Host_DeviceEnumerationComplete() event, the host still will assume the device enumeration has failed.
+ *

  *  Once initialized, it is important to maintain the class driver's state by repeatedly calling the Class Driver's
  *  <tt><b>{Class Name}</b>_Host_USBTask()</tt> function in the main program loop. The exact implementation of this
  *  function varies between class drivers, and can be used for any internal class driver purpose to maintain each
  *  Once initialized, it is important to maintain the class driver's state by repeatedly calling the Class Driver's
  *  <tt><b>{Class Name}</b>_Host_USBTask()</tt> function in the main program loop. The exact implementation of this
  *  function varies between class drivers, and can be used for any internal class driver purpose to maintain each


@@ -329,10 +351,8 @@
  *
  *      for (;;)
  *      {
  *
  *      for (;;)
  *      {

- *          switch (USB_HostState)
- *          {
- *             // Host state machine handling here
- *          }
+ *          if (USB_HostState != HOST_STATE_Configured)
+ *              Create_And_Process_Samples();

  *
  *          MIDI_Host_USBTask(&My_Audio_Interface);
  *          USB_USBTask();
  *
  *          MIDI_Host_USBTask(&My_Audio_Interface);
  *          USB_USBTask();


@@ -366,7 +386,7 @@
                #include "Core/USBTask.h"
                #include "Core/Events.h"
                #include "Core/StdDescriptors.h"
                #include "Core/USBTask.h"
                #include "Core/Events.h"
                #include "Core/StdDescriptors.h"

-               #include "Core/ConfigDescriptor.h"
+               #include "Core/ConfigDescriptors.h"

                #include "Core/USBController.h"
                #include "Core/USBInterrupt.h"
 
                #include "Core/USBController.h"
                #include "Core/USBInterrupt.h"
 


@@ -387,15 +407,16 @@
                #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
                        #include "Core/OTG.h"
                #endif
                #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
                        #include "Core/OTG.h"
                #endif

-               
-               #include "Class/Audio.h"
-               #include "Class/CDC.h"
-               #include "Class/HID.h"
-               #include "Class/MassStorage.h"
-               #include "Class/MIDI.h"
-               #include "Class/Printer.h"
-               #include "Class/RNDIS.h"
-               #include "Class/StillImage.h"
+
+               #include "Class/AndroidAccessoryClass.h"
+               #include "Class/AudioClass.h"
+               #include "Class/CDCClass.h"
+               #include "Class/HIDClass.h"
+               #include "Class/MassStorageClass.h"
+               #include "Class/MIDIClass.h"
+               #include "Class/PrinterClass.h"
+               #include "Class/RNDISClass.h"
+               #include "Class/StillImageClass.h"

 
 #endif
 
 
 #endif