Move RNDISConstants.h into the RNDIS class driver common definition header.

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

diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/Audio.h
index 49d6372..a33e98e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Audio.h
+++ b/LUFA/Drivers/USB/Class/Audio.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 */
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   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 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
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -38,15 +38,15 @@
  */
 
 /** \ingroup Group_USBClassDrivers
  */
 
 /** \ingroup Group_USBClassDrivers

- *  @defgroup Group_USBClassAudio Audio Class Driver - LUFA/Drivers/Class/Audio.h
+ *  @defgroup Group_USBClassAudio Audio Class Driver

  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:

- *    - LUFA/Drivers/USB/Class/Device/Audio.c
+ *    - LUFA/Drivers/USB/Class/Device/Audio.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>

  *
  *  \section Module Description
  *
  *  \section Module Description

- *  Audio Class Driver module. This module contains an internal implementation of the USB Audio Class, for Device
- *  USB mode only. User applications can use this class driver instead of implementing the Audio class manually via 
+ *  Audio Class Driver module. This module contains an internal implementation of the USB Audio 1.0 Class, for Device
+ *  USB mode only. User applications can use this class driver instead of implementing the Audio class manually via

  *  the low-level LUFA APIs.
  *
  *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
  *  the low-level LUFA APIs.
  *
  *  This module is designed to simplify the user code by exposing only the required interface needed to interface with


@@ -59,20 +59,17 @@
 #define _AUDIO_CLASS_H_
 
        /* Macros: */
 #define _AUDIO_CLASS_H_
 
        /* Macros: */

-               #define __INCLUDE_FROM_AUDIO_DRIVER

                #define __INCLUDE_FROM_USB_DRIVER
                #define __INCLUDE_FROM_USB_DRIVER

+               #define __INCLUDE_FROM_AUDIO_DRIVER

 
        /* Includes: */
                #include "../HighLevel/USBMode.h"
 
        /* Includes: */
                #include "../HighLevel/USBMode.h"

-               
-               #if defined(NO_STREAM_CALLBACKS)
-                       #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
-               #endif

 
                #if defined(USB_CAN_BE_DEVICE)
                        #include "Device/Audio.h"
                #endif
 
                #if defined(USB_CAN_BE_DEVICE)
                        #include "Device/Audio.h"
                #endif

-               
+

 #endif
 
 /** @} */
 #endif
 
 /** @} */

+