Mark build test makefiles as being incompatible with parallel make builds, as they...

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

diff --git a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
index dad177e..52c5a1a 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
+++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
@@ -79,23 +79,15 @@
                        {
                                struct
                                {
+                                       uint8_t  ControlInterfaceNumber; /**< Index of the Audio Control interface within the device this
+                                                                         *   structure controls.
+                                                                         */
                                        uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this
                                                                                                                *   structure controls.
                                                                                                                */
 
-                                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incoming Audio Streaming data, if available
-                                                                                                       *   (zero if unused).
-                                                                                                       */
-                                       uint16_t DataINEndpointSize; /**< Size in bytes of the incoming Audio Streaming data endpoint, if available
-                                                                                                 *   (zero if unused).
-                                                                                                 */
-
-                                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing Audio Streaming data, if available
-                                                                                                        *   (zero if unused).
-                                                                                                        */
-                                       uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing Audio Streaming data endpoint, if available
-                                                                                                  *   (zero if unused).
-                                                                                                  */
+                                       USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
+                                       USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
                                } Config; /**< Config data for the USB class interface within the device. All elements in this section
                                           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
                                           */
@@ -132,7 +124,7 @@
                         *
                         *  When the DataLength parameter is NULL, this callback should only indicate whether the specified operation is valid for
                         *  the given endpoint index, and should return as fast as possible. When non-NULL, this value may be altered for GET operations
-                        *  to indicate the size of the retreived data.
+                        *  to indicate the size of the retrieved data.
                         *
                         *  \note The length of the retrieved data stored into the Data buffer on GET operations should not exceed the initial value
                         *        of the \c DataLength parameter.
@@ -161,7 +153,7 @@
                         *
                         *  When the DataLength parameter is NULL, this callback should only indicate whether the specified operation is valid for
                         *  the given entity and should return as fast as possible. When non-NULL, this value may be altered for GET operations
-                        *  to indicate the size of the retreived data.
+                        *  to indicate the size of the retrieved data.
                         *
                         *  \note The length of the retrieved data stored into the Data buffer on GET operations should not exceed the initial value
                         *        of the \c DataLength parameter.
@@ -223,7 +215,7 @@
                                if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
                                  return false;
 
-                               Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);
+                               Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpoint.Address);
                                return Endpoint_IsOUTReceived();
                        }
 
@@ -244,7 +236,7 @@
                                if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
                                  return false;
 
-                               Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);
+                               Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpoint.Address);
                                return Endpoint_IsINReady();
                        }
 
@@ -338,7 +330,7 @@
                        {
                                Endpoint_Write_8(Sample);
 
-                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpoint.Size)
                                  Endpoint_ClearIN();
                        }
 
@@ -357,7 +349,7 @@
                        {
                                Endpoint_Write_16_LE(Sample);
 
-                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpoint.Size)
                                  Endpoint_ClearIN();
                        }
 
@@ -377,7 +369,7 @@
                                Endpoint_Write_16_LE(Sample);
                                Endpoint_Write_8(Sample >> 16);
 
-                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpoint.Size)
                                  Endpoint_ClearIN();
                        }