X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/588886878e0fe948417123b57c108a1bd7992f85..d2ed97e34b42aff851fa8ba39c43b6cb9e4f6448:/LUFA/Drivers/USB/USB.h?ds=sidebyside
diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 223967008..3bc356d8e 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -83,8 +83,8 @@
  *  
  *  
  *   | USB Class- * | Device- * | Host+ * | Device Mode+ * | Host Mode* | 
  *  
  *   | Audio@@ -113,13 +113,13 @@
  * | 
  *  
  *   | Printer- * | Yes+ * | No* | Yes* | 
  *  
  *   | RNDIS* | Yes- * | No+ * | Yes* | 
  *  
  *   | Still Image@@ -127,24 +127,244 @@
  * | Yes* | 
  *  
+ *
+ *
+ *  \section Sec_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.
+ *
+ *  \subsection SSec_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 USB_ClassInfo_{Class Name}_Device_t, and are used to hold the
+ *  complete state and configuration for each class instance. Multiple class instances is where the power of the class 
+ *  drivers lie; multiple interfaces of the same class simply require more instances of the Class Driver's ClassInfo 
+ *  structure.
+ *
+ *  Inside the ClassInfo structure lies two sections, a Config section, and a State section. The Config
+ *  section contains the instance's configuration parameters, and must have all fields set by the user application
+ *  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 State section of the 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
+ *  USB_ClassInfo_Audio_Device_t My_Audio_Interface =
+ *  {
+ *      .Config =
+ *          {
+ *              .StreamingInterfaceNumber = 1,
+ *              
+ *              .DataINEndpointNumber     = 1,
+ *              .DataINEndpointSize       = 256,
+ *          },
+ *  };
+ *  \endcode
+ *
+ *  \note The class driver's configuration parameters should match those used in the device's descriptors that are
+ *  sent to the host.
+ *
+ *  To initialize the Class driver instance, the driver's {Class Name}_Device_ConfigureEndpoints() function
+ *  should be called in response to the \ref EVENT_USB_Device_ConfigurationChanged() event. This function will return a
+ *  boolean value if the driver sucessfully 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 seperate instances of
+ *  the same class type can be initialized like thus:
+ *
+ *  \code
+ *  void EVENT_USB_Device_ConfigurationChanged(void)
+ *  {
+ *  	LEDs_SetAllLEDs(LEDMASK_USB_READY);
+ *  	
+ *  	if (!(Audio_Device_ConfigureEndpoints(&My_Audio_Interface)))
+ *  	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+ *  }
+ *  \endcode
+ * 
+ *  Once initialized, it is important to maintain the class driver's state by repeatedly calling the Class Driver's
+ *  {Class Name}_Device_USBTask() 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
+ *  instance. Again, this function uses the address of the instance to operate on, and thus needs to be called for each
+ *  seperate instance, just like the main USB maintenance routine \ref USB_USBTask():
+ *
+ *  \code
+ *  int main(void)
+ *  {
+ *      SetupHardware();
+ *  
+ *      LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+ *  
+ *      for (;;)
+ *      {
+ *          Create_And_Process_Samples();
+ *      
+ *          Audio_Device_USBTask(&My_Audio_Interface);
+ *          USB_USBTask();
+ *      }
+ *  }
+ *  \endcode
+ *
+ *  The final standardized Device Class Driver function is the Control Request handler function
+ *  {Class Name}_Device_ProcessControlRequest(), which should be called when the
+ *  \ref EVENT_USB_Device_UnhandledControlRequest() event fires. This function should also be
+ *  called for each class driver instance, using the address of the instance to operate on as
+ *  the function's parameter. The request handler will abort if it is determined that the current
+ *  request is not targeted at the given class driver instance, thus these methods can safely be
+ *  called one-after-another in the event handler with no form of error checking:
+ *
+ *  \code
+ *  void EVENT_USB_Device_UnhandledControlRequest(void)
+ *  {
+ *      Audio_Device_ProcessControlRequest(&My_Audio_Interface);
+ *  }
+ *  \endcode
+ *
+ *  Each class driver may also define a set of callback functions (which are prefixed by "CALLBACK_"
+ *  in the function's name) which must also be added to the user application - refer to each
+ *  individual class driver's documentation for mandatory callbacks. In addition, each class driver may
+ *  also define a set of events (identifiable by their prefix of "EVENT_" in the function's name), which
+ *  the user application may choose to implement, or ignore if not needed.
+ *
+ *  The individual Device Mode Class Driver documentation contains more information on the non-standardized,
+ *  class-specific functions which the user application can then use on the driver instances, such as data
+ *  read and write routines. See each driver's individual documentation for more information on the
+ *  class-specific functions.
+ *
+ *  \subsection SSec_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 USB_ClassInfo_{Class Name}_Host_t, and are used to hold the
+ *  complete state and configuration for each class instance. Multiple class instances is where the power of the class 
+ *  drivers lie; multiple interfaces of the same class simply require more instances of the Class Driver's ClassInfo 
+ *  structure.
+ *
+ *  Inside the ClassInfo structure lies two sections, a Config section, and a State section. The Config
+ *  section contains the instance's configuration parameters, and must have all fields set by the user application
+ *  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 State section of the 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:
+ *
+ *  \code
+ *  USB_ClassInfo_MIDI_Host_t My_MIDI_Interface =
+ *  {
+ *      .Config =
+ *          {
+ *              .DataINPipeNumber       = 1,
+ *              .DataINPipeDoubleBank   = false,
+ *              
+ *              .DataOUTPipeNumber      = 2,
+ *              .DataOUTPipeDoubleBank  = false,
+ *          },
+ *  };
+ *  \endcode
+ *
+ *  To initialize the Class driver instance, the driver's {Class Name}_Host_ConfigurePipes() function
+ *  should be called in response to the host state machine entering the \ref HOST_STATE_Addressed state. This function
+ *  will return an error code from the class driver's {Class Name}_EnumerationFailure_ErrorCodes_t enum
+ *  to indicate if the driver sucessfully 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
+ *  - in this manner, multiple seperate instances of the same class type can be initialized. A fragment of a Class Driver
+ *  based Host mode application may look like the following:
+ *
+ *  \code
+ *      switch (USB_HostState)
+ *      {
+ *          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
+ *  \endcode
+ *
+ *  Note that the function also required 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.
+ *
+ *  Once initialized, it is important to maintain the class driver's state by repeatedly calling the Class Driver's
+ *  {Class Name}_Host_USBTask() 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
+ *  instance. Again, this function uses the address of the instance to operate on, and thus needs to be called for each
+ *  seperate instance, just like the main USB maintenance routine \ref USB_USBTask():
+ *
+ *  \code
+ *  int main(void)
+ *  {
+ *      SetupHardware();
+ *  
+ *      LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+ *  
+ *      for (;;)
+ *      {
+ *          switch (USB_HostState)
+ *          {
+ *             // Host state machine handling here
+ *          } 
+ *      
+ *          MIDI_Host_USBTask(&My_Audio_Interface);
+ *          USB_USBTask();
+ *      }
+ *  }
+ *  \endcode
+ *
+ *  Each class driver may also define a set of callback functions (which are prefixed by "CALLBACK_"
+ *  in the function's name) which must also be added to the user application - refer to each
+ *  individual class driver's documentation for mandatory callbacks. In addition, each class driver may
+ *  also define a set of events (identifiable by their prefix of "EVENT_" in the function's name), which
+ *  the user application may choose to implement, or ignore if not needed.
+ *
+ *  The individual Host Mode Class Driver documentation contains more information on the non-standardized,
+ *  class-specific functions which the user application can then use on the driver instances, such as data
+ *  read and write routines. See each driver's individual documentation for more information on the
+ *  class-specific functions.
  */
  
 #ifndef __USB_H__
 #define __USB_H__
 
+	/* Macros: */
+		#if !defined(__DOXYGEN__)
+			#define __INCLUDE_FROM_USB_DRIVER
+		#endif
+
+	/* Includes: */
+		#include "HighLevel/USBMode.h"
+
 	/* Preprocessor Checks: */		
-		#if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) ||  \
-		       defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) ||  \
-			   defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__)  ||  \
-			   defined(__AVR_ATmega32U2__)  || defined(__AVR_ATmega16U2__) ||  \
-			   defined(__AVR_ATmega8U2__)   ||                                 \
-			   defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) ||  \
-			   defined(__AVR_ATmega32U6__)))
+		#if (!defined(USB_SERIES_2_AVR) && !defined(USB_SERIES_4_AVR) && \
+		     !defined(USB_SERIES_6_AVR) && !defined(USB_SERIES_7_AVR))
 			#error The currently selected AVR model is not supported under the USB component of the LUFA library.
 		#endif
 		
 	/* Includes: */
-		#include "HighLevel/USBMode.h"
 		#include "HighLevel/USBTask.h"
 		#include "HighLevel/USBInterrupt.h"
 		#include "HighLevel/Events.h"