Merge pull request #4629 from Guozhanxin/uac

【完善】uac class, 去除 GPL 代码

4 files changed, 475 insertions, 735 deletions

diff --git a/components/drivers/usb/usbdevice/class/audio.h b/components/drivers/usb/usbdevice/class/audio.h
deleted file mode 100644
index 4bb8994b47..0000000000
--- a/components/drivers/usb/usbdevice/class/audio.h
+++ /dev/null
@@ -1,676 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * <linux/usb/audio.h> -- USB Audio definitions.
- *
- * Copyright (C) 2006 Thumtronics Pty Ltd.
- * Developed for Thumtronics by Grey Innovation
- * Ben Williamson <[email protected]>
- *
- * This software is distributed under the terms of the GNU General Public
- * License ("GPL") version 2, as published by the Free Software Foundation.
- *
- * This file holds USB constants and structures defined
- * by the USB Device Class Definition for Audio Devices.
- * Comments below reference relevant sections of that document:
- *
- * http://www.usb.org/developers/devclass_docs/audio10.pdf
- *
- * Types and defines in this file are either specific to version 1.0 of
- * this standard or common for newer versions.
- */
-
-#ifndef _UAPI__LINUX_USB_AUDIO_H
-#define _UAPI__LINUX_USB_AUDIO_H
-
-//#include <linux/types.h>
-#include <rtthread.h>
-
-typedef int8_t   __s8;
-typedef uint8_t  __u8;
-typedef int16_t  __s16;
-typedef uint16_t __u16;
-typedef int32_t  __s32;
-typedef uint32_t __u32;
-typedef int64_t  __s64;
-typedef uint64_t __u64;
-
-#define UAC_USE_FEATURE_UNIT  0  /* Feature unit does not support */
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
-
-#ifdef __CHECKER__
-#define __bitwise__ __attribute__((bitwise))
-#else
-#define __bitwise__
-#endif
-#ifdef __CHECK_ENDIAN__
-#define __bitwise __bitwise__
-#else
-#define __bitwise
-#endif
-
-typedef __u16 __bitwise __le16;
-typedef __u16 __bitwise __be16;
-typedef __u32 __bitwise __le32;
-typedef __u32 __bitwise __be32;
-typedef __u64 __bitwise __le64;
-typedef __u64 __bitwise __be64;
-
-typedef __u16 __bitwise __sum16;
-typedef __u32 __bitwise __wsum;
-
-/* bInterfaceProtocol values to denote the version of the standard used */
-#define UAC_VERSION_1           0x00
-#define UAC_VERSION_2           0x20
-#define UAC_VERSION_3           0x30
-
-/* A.2 Audio Interface Subclass Codes */
-#define USB_SUBCLASS_AUDIOCONTROL   0x01
-#define USB_SUBCLASS_AUDIOSTREAMING 0x02
-#define USB_SUBCLASS_MIDISTREAMING  0x03
-
-/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
-#define UAC_HEADER          0x01
-#define UAC_INPUT_TERMINAL      0x02
-#define UAC_OUTPUT_TERMINAL     0x03
-#define UAC_MIXER_UNIT          0x04
-#define UAC_SELECTOR_UNIT       0x05
-#define UAC_FEATURE_UNIT        0x06
-#define UAC1_PROCESSING_UNIT        0x07
-#define UAC1_EXTENSION_UNIT     0x08
-
-/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
-#define UAC_AS_GENERAL          0x01
-#define UAC_FORMAT_TYPE         0x02
-#define UAC_FORMAT_SPECIFIC     0x03
-
-/* A.7 Processing Unit Process Types */
-#define UAC_PROCESS_UNDEFINED       0x00
-#define UAC_PROCESS_UP_DOWNMIX      0x01
-#define UAC_PROCESS_DOLBY_PROLOGIC  0x02
-#define UAC_PROCESS_STEREO_EXTENDER 0x03
-#define UAC_PROCESS_REVERB      0x04
-#define UAC_PROCESS_CHORUS      0x05
-#define UAC_PROCESS_DYN_RANGE_COMP  0x06
-
-/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_EP_GENERAL          0x01
-
-/* A.9 Audio Class-Specific Request Codes */
-#define UAC_SET_            0x00
-#define UAC_GET_            0x80
-
-#define UAC__CUR            0x1
-#define UAC__MIN            0x2
-#define UAC__MAX            0x3
-#define UAC__RES            0x4
-#define UAC__MEM            0x5
-
-#define UAC_SET_CUR         (UAC_SET_ | UAC__CUR)
-#define UAC_GET_CUR         (UAC_GET_ | UAC__CUR)
-#define UAC_SET_MIN         (UAC_SET_ | UAC__MIN)
-#define UAC_GET_MIN         (UAC_GET_ | UAC__MIN)
-#define UAC_SET_MAX         (UAC_SET_ | UAC__MAX)
-#define UAC_GET_MAX         (UAC_GET_ | UAC__MAX)
-#define UAC_SET_RES         (UAC_SET_ | UAC__RES)
-#define UAC_GET_RES         (UAC_GET_ | UAC__RES)
-#define UAC_SET_MEM         (UAC_SET_ | UAC__MEM)
-#define UAC_GET_MEM         (UAC_GET_ | UAC__MEM)
-
-#define UAC_GET_STAT            0xff
-
-/* A.10 Control Selector Codes */
-
-/* A.10.1 Terminal Control Selectors */
-#define UAC_TERM_COPY_PROTECT       0x01
-
-/* A.10.2 Feature Unit Control Selectors */
-#define UAC_FU_MUTE         0x01
-#define UAC_FU_VOLUME           0x02
-#define UAC_FU_BASS         0x03
-#define UAC_FU_MID          0x04
-#define UAC_FU_TREBLE           0x05
-#define UAC_FU_GRAPHIC_EQUALIZER    0x06
-#define UAC_FU_AUTOMATIC_GAIN       0x07
-#define UAC_FU_DELAY            0x08
-#define UAC_FU_BASS_BOOST       0x09
-#define UAC_FU_LOUDNESS         0x0a
-
-#define UAC_CONTROL_BIT(CS) (1 << ((CS) - 1))
-
-/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
-#define UAC_UD_ENABLE           0x01
-#define UAC_UD_MODE_SELECT      0x02
-
-/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
-#define UAC_DP_ENABLE           0x01
-#define UAC_DP_MODE_SELECT      0x02
-
-/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
-#define UAC_3D_ENABLE           0x01
-#define UAC_3D_SPACE            0x02
-
-/* A.10.3.4 Reverberation Processing Unit Control Selectors */
-#define UAC_REVERB_ENABLE       0x01
-#define UAC_REVERB_LEVEL        0x02
-#define UAC_REVERB_TIME         0x03
-#define UAC_REVERB_FEEDBACK     0x04
-
-/* A.10.3.5 Chorus Processing Unit Control Selectors */
-#define UAC_CHORUS_ENABLE       0x01
-#define UAC_CHORUS_LEVEL        0x02
-#define UAC_CHORUS_RATE         0x03
-#define UAC_CHORUS_DEPTH        0x04
-
-/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
-#define UAC_DCR_ENABLE          0x01
-#define UAC_DCR_RATE            0x02
-#define UAC_DCR_MAXAMPL         0x03
-#define UAC_DCR_THRESHOLD       0x04
-#define UAC_DCR_ATTACK_TIME     0x05
-#define UAC_DCR_RELEASE_TIME        0x06
-
-/* A.10.4 Extension Unit Control Selectors */
-#define UAC_XU_ENABLE           0x01
-
-/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
-#define UAC_MS_HEADER           0x01
-#define UAC_MIDI_IN_JACK        0x02
-#define UAC_MIDI_OUT_JACK       0x03
-
-/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_MS_GENERAL          0x01
-
-/* Terminals - 2.1 USB Terminal Types */
-#define UAC_TERMINAL_UNDEFINED      0x100
-#define UAC_TERMINAL_STREAMING      0x101
-#define UAC_TERMINAL_VENDOR_SPEC    0x1FF
-
-/* Terminal Control Selectors */
-/* 4.3.2  Class-Specific AC Interface Descriptor */
-struct uac1_ac_header_descriptor {
-    __u8  bLength;          /* 8 + n */
-    __u8  bDescriptorType;      /* USB_DT_CS_INTERFACE */
-    __u8  bDescriptorSubtype;   /* UAC_MS_HEADER */
-    __le16 bcdADC;          /* 0x0100 */
-    __le16 wTotalLength;        /* includes Unit and Terminal desc. */
-    __u8  bInCollection;        /* n */
-    __u8  baInterfaceNr[];      /* [n] */
-} __attribute__ ((packed));
-
-#define UAC_DT_AC_HEADER_SIZE(n)    (8 + (n))
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)         \
-struct uac1_ac_header_descriptor_##n {          \
-    __u8  bLength;                      \
-    __u8  bDescriptorType;                  \
-    __u8  bDescriptorSubtype;               \
-    __le16 bcdADC;                      \
-    __le16 wTotalLength;                    \
-    __u8  bInCollection;                    \
-    __u8  baInterfaceNr[n];                 \
-} __attribute__ ((packed))
-
-/* 4.3.2.1 Input Terminal Descriptor */
-struct uac_input_terminal_descriptor {
-    __u8  bLength;          /* in bytes: 12 */
-    __u8  bDescriptorType;      /* CS_INTERFACE descriptor type */
-    __u8  bDescriptorSubtype;   /* INPUT_TERMINAL descriptor subtype */
-    __u8  bTerminalID;      /* Constant uniquely terminal ID */
-    __le16 wTerminalType;       /* USB Audio Terminal Types */
-    __u8  bAssocTerminal;       /* ID of the Output Terminal associated */
-    __u8  bNrChannels;      /* Number of logical output channels */
-    __le16 wChannelConfig;
-    __u8  iChannelNames;
-    __u8  iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_INPUT_TERMINAL_SIZE          12
-
-/* Terminals - 2.2 Input Terminal Types */
-#define UAC_INPUT_TERMINAL_UNDEFINED            0x200
-#define UAC_INPUT_TERMINAL_MICROPHONE           0x201
-#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE       0x202
-#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE      0x203
-#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE      0x204
-#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY     0x205
-#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY    0x206
-
-/* Terminals - control selectors */
-
-#define UAC_TERMINAL_CS_COPY_PROTECT_CONTROL        0x01
-
-/* 4.3.2.2 Output Terminal Descriptor */
-struct uac1_output_terminal_descriptor {
-    __u8  bLength;          /* in bytes: 9 */
-    __u8  bDescriptorType;      /* CS_INTERFACE descriptor type */
-    __u8  bDescriptorSubtype;   /* OUTPUT_TERMINAL descriptor subtype */
-    __u8  bTerminalID;      /* Constant uniquely terminal ID */
-    __le16 wTerminalType;       /* USB Audio Terminal Types */
-    __u8  bAssocTerminal;       /* ID of the Input Terminal associated */
-    __u8  bSourceID;        /* ID of the connected Unit or Terminal*/
-    __u8  iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_OUTPUT_TERMINAL_SIZE         9
-
-/* Terminals - 2.3 Output Terminal Types */
-#define UAC_OUTPUT_TERMINAL_UNDEFINED           0x300
-#define UAC_OUTPUT_TERMINAL_SPEAKER         0x301
-#define UAC_OUTPUT_TERMINAL_HEADPHONES          0x302
-#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO  0x303
-#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER     0x304
-#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER        0x305
-#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER   0x306
-#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER    0x307
-
-/* Terminals - 2.4 Bi-directional Terminal Types */
-#define UAC_BIDIR_TERMINAL_UNDEFINED            0x400
-#define UAC_BIDIR_TERMINAL_HANDSET          0x401
-#define UAC_BIDIR_TERMINAL_HEADSET          0x402
-#define UAC_BIDIR_TERMINAL_SPEAKER_PHONE        0x403
-#define UAC_BIDIR_TERMINAL_ECHO_SUPPRESSING     0x404
-#define UAC_BIDIR_TERMINAL_ECHO_CANCELING       0x405
-
-/* Set bControlSize = 2 as default setting */
-#define UAC_DT_FEATURE_UNIT_SIZE(ch)        (7 + ((ch) + 1) * 2)
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)         \
-struct uac_feature_unit_descriptor_##ch {           \
-    __u8  bLength;                      \
-    __u8  bDescriptorType;                  \
-    __u8  bDescriptorSubtype;               \
-    __u8  bUnitID;                      \
-    __u8  bSourceID;                    \
-    __u8  bControlSize;                 \
-    __le16 bmaControls[ch + 1];             \
-    __u8  iFeature;                     \
-} __attribute__ ((packed))
-
-/* 4.3.2.3 Mixer Unit Descriptor */
-struct uac_mixer_unit_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bUnitID;
-    __u8 bNrInPins;
-    __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
-{
-    return desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,
-                          int protocol)
-{
-    if (protocol == UAC_VERSION_1)
-        return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-            desc->baSourceID[desc->bNrInPins + 1];
-    else
-        return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-            (desc->baSourceID[desc->bNrInPins + 3] << 16) |
-            (desc->baSourceID[desc->bNrInPins + 2] << 8)  |
-            (desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,
-                        int protocol)
-{
-    return (protocol == UAC_VERSION_1) ?
-        desc->baSourceID[desc->bNrInPins + 3] :
-        desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
-                          int protocol)
-{
-    switch (protocol) {
-    case UAC_VERSION_1:
-        return &desc->baSourceID[desc->bNrInPins + 4];
-    case UAC_VERSION_2:
-        return &desc->baSourceID[desc->bNrInPins + 6];
-    case UAC_VERSION_3:
-        return &desc->baSourceID[desc->bNrInPins + 2];
-    default:
-        return NULL;
-    }
-}
-
-static inline __u16 uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
-{
-    return (desc->baSourceID[desc->bNrInPins + 1] << 8) |
-        desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
-{
-    __u8 *raw = (__u8 *) desc;
-    return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.4 Selector Unit Descriptor */
-struct uac_selector_unit_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bUintID;
-    __u8 bNrInPins;
-    __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
-{
-    __u8 *raw = (__u8 *) desc;
-    return raw[desc->bLength - 1];
-}
-#if UAC_USE_FEATURE_UNIT
-/* 4.3.2.5 Feature Unit Descriptor */
-struct uac_feature_unit_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bUnitID;
-    __u8 bSourceID;
-    __u8 bControlSize;
-    __u8 bmaControls[0]; /* variable length */
-} __attribute__((packed));
-
-static inline __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
-{
-    __u8 *raw = (__u8 *) desc;
-    return raw[desc->bLength - 1];
-}
-#endif
-/* 4.3.2.6 Processing Unit Descriptors */
-struct uac_processing_unit_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bUnitID;
-    __le16 wProcessType;
-    __u8 bNrInPins;
-    __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
-{
-    return desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,
-                               int protocol)
-{
-    if (protocol == UAC_VERSION_1)
-        return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-            desc->baSourceID[desc->bNrInPins + 1];
-    else
-        return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-            (desc->baSourceID[desc->bNrInPins + 3] << 16) |
-            (desc->baSourceID[desc->bNrInPins + 2] << 8)  |
-            (desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,
-                             int protocol)
-{
-    return (protocol == UAC_VERSION_1) ?
-        desc->baSourceID[desc->bNrInPins + 3] :
-        desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
-                            int protocol)
-{
-    switch (protocol) {
-    case UAC_VERSION_1:
-        return desc->baSourceID[desc->bNrInPins + 4];
-    case UAC_VERSION_2:
-        return 2; /* in UAC2, this value is constant */
-    case UAC_VERSION_3:
-        return 4; /* in UAC3, this value is constant */
-    default:
-        return 1;
-    }
-}
-
-static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
-                           int protocol)
-{
-    switch (protocol) {
-    case UAC_VERSION_1:
-        return &desc->baSourceID[desc->bNrInPins + 5];
-    case UAC_VERSION_2:
-        return &desc->baSourceID[desc->bNrInPins + 6];
-    case UAC_VERSION_3:
-        return &desc->baSourceID[desc->bNrInPins + 2];
-    default:
-        return NULL;
-    }
-}
-
-static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
-                           int protocol)
-{
-    __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-
-    switch (protocol) {
-    case UAC_VERSION_1:
-    case UAC_VERSION_2:
-    default:
-        return *(uac_processing_unit_bmControls(desc, protocol)
-             + control_size);
-    case UAC_VERSION_3:
-        return 0; /* UAC3 does not have this field */
-    }
-}
-
-static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
-                         int protocol)
-{
-    __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-
-    switch (protocol) {
-    case UAC_VERSION_1:
-    case UAC_VERSION_2:
-    default:
-        return uac_processing_unit_bmControls(desc, protocol)
-            + control_size + 1;
-    case UAC_VERSION_3:
-        return uac_processing_unit_bmControls(desc, protocol)
-            + control_size;
-    }
-}
-
-/*
- * Extension Unit (XU) has almost compatible layout with Processing Unit, but
- * on UAC2, it has a different bmControls size (bControlSize); it's 1 byte for
- * XU while 2 bytes for PU.  The last iExtension field is a one-byte index as
- * well as iProcessing field of PU.
- */
-static inline __u8 uac_extension_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
-                           int protocol)
-{
-    switch (protocol) {
-    case UAC_VERSION_1:
-        return desc->baSourceID[desc->bNrInPins + 4];
-    case UAC_VERSION_2:
-        return 1; /* in UAC2, this value is constant */
-    case UAC_VERSION_3:
-        return 4; /* in UAC3, this value is constant */
-    default:
-        return 1;
-    }
-}
-
-static inline __u8 uac_extension_unit_iExtension(struct uac_processing_unit_descriptor *desc,
-                         int protocol)
-{
-    __u8 control_size = uac_extension_unit_bControlSize(desc, protocol);
-
-    switch (protocol) {
-    case UAC_VERSION_1:
-    case UAC_VERSION_2:
-    default:
-        return *(uac_processing_unit_bmControls(desc, protocol)
-             + control_size);
-    case UAC_VERSION_3:
-        return 0; /* UAC3 does not have this field */
-    }
-}
-
-/* 4.5.2 Class-Specific AS Interface Descriptor */
-struct uac1_as_header_descriptor {
-    __u8  bLength;          /* in bytes: 7 */
-    __u8  bDescriptorType;      /* USB_DT_CS_INTERFACE */
-    __u8  bDescriptorSubtype;   /* AS_GENERAL */
-    __u8  bTerminalLink;        /* Terminal ID of connected Terminal */
-    __u8  bDelay;           /* Delay introduced by the data path */
-    __le16 wFormatTag;      /* The Audio Data Format */
-} __attribute__ ((packed));
-
-#define UAC_DT_AS_HEADER_SIZE       7
-
-/* Formats - A.1.1 Audio Data Format Type I Codes */
-#define UAC_FORMAT_TYPE_I_UNDEFINED 0x0
-#define UAC_FORMAT_TYPE_I_PCM       0x1
-#define UAC_FORMAT_TYPE_I_PCM8      0x2
-#define UAC_FORMAT_TYPE_I_IEEE_FLOAT    0x3
-#define UAC_FORMAT_TYPE_I_ALAW      0x4
-#define UAC_FORMAT_TYPE_I_MULAW     0x5
-
-struct uac_format_type_i_continuous_descriptor {
-    __u8  bLength;          /* in bytes: 8 + (ns * 3) */
-    __u8  bDescriptorType;      /* USB_DT_CS_INTERFACE */
-    __u8  bDescriptorSubtype;   /* FORMAT_TYPE */
-    __u8  bFormatType;      /* FORMAT_TYPE_1 */
-    __u8  bNrChannels;      /* physical channels in the stream */
-    __u8  bSubframeSize;        /* */
-    __u8  bBitResolution;
-    __u8  bSamFreqType;
-    __u8  tLowerSamFreq[3];
-    __u8  tUpperSamFreq[3];
-} __attribute__ ((packed));
-
-#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE  14
-
-struct uac_format_type_i_discrete_descriptor {
-    __u8  bLength;          /* in bytes: 8 + (ns * 3) */
-    __u8  bDescriptorType;      /* USB_DT_CS_INTERFACE */
-    __u8  bDescriptorSubtype;   /* FORMAT_TYPE */
-    __u8  bFormatType;      /* FORMAT_TYPE_1 */
-    __u8  bNrChannels;      /* physical channels in the stream */
-    __u8  bSubframeSize;        /* */
-    __u8  bBitResolution;
-    __u8  bSamFreqType;
-    __u8  tSamFreq[][3];
-} __attribute__ ((packed));
-
-#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)      \
-struct uac_format_type_i_discrete_descriptor_##n {      \
-    __u8  bLength;                      \
-    __u8  bDescriptorType;                  \
-    __u8  bDescriptorSubtype;               \
-    __u8  bFormatType;                  \
-    __u8  bNrChannels;                  \
-    __u8  bSubframeSize;                    \
-    __u8  bBitResolution;                   \
-    __u8  bSamFreqType;                 \
-    __u8  tSamFreq[n][3];                   \
-} __attribute__ ((packed))
-
-#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
-
-struct uac_format_type_i_ext_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bFormatType;
-    __u8 bSubslotSize;
-    __u8 bBitResolution;
-    __u8 bHeaderLength;
-    __u8 bControlSize;
-    __u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* Formats - Audio Data Format Type I Codes */
-
-#define UAC_FORMAT_TYPE_II_MPEG 0x1001
-#define UAC_FORMAT_TYPE_II_AC3  0x1002
-
-struct uac_format_type_ii_discrete_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bFormatType;
-    __le16 wMaxBitRate;
-    __le16 wSamplesPerFrame;
-    __u8 bSamFreqType;
-    __u8 tSamFreq[][3];
-} __attribute__((packed));
-
-struct uac_format_type_ii_ext_descriptor {
-    __u8 bLength;
-    __u8 bDescriptorType;
-    __u8 bDescriptorSubtype;
-    __u8 bFormatType;
-    __le16 wMaxBitRate;
-    __le16 wSamplesPerFrame;
-    __u8 bHeaderLength;
-    __u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* type III */
-#define UAC_FORMAT_TYPE_III_IEC1937_AC3 0x2001
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG1_LAYER1    0x2002
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_NOEXT 0x2003
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_EXT   0x2004
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER1_LS 0x2005
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER23_LS    0x2006
-
-/* Formats - A.2 Format Type Codes */
-#define UAC_FORMAT_TYPE_UNDEFINED   0x0
-#define UAC_FORMAT_TYPE_I       0x1
-#define UAC_FORMAT_TYPE_II      0x2
-#define UAC_FORMAT_TYPE_III     0x3
-#define UAC_EXT_FORMAT_TYPE_I       0x81
-#define UAC_EXT_FORMAT_TYPE_II      0x82
-#define UAC_EXT_FORMAT_TYPE_III     0x83
-
-struct uac_iso_endpoint_descriptor {
-    __u8  bLength;          /* in bytes: 7 */
-    __u8  bDescriptorType;      /* USB_DT_CS_ENDPOINT */
-    __u8  bDescriptorSubtype;   /* EP_GENERAL */
-    __u8  bmAttributes;
-    __u8  bLockDelayUnits;
-    __le16 wLockDelay;
-} __attribute__((packed));
-#define UAC_ISO_ENDPOINT_DESC_SIZE  7
-
-#define UAC_EP_CS_ATTR_SAMPLE_RATE  0x01
-#define UAC_EP_CS_ATTR_PITCH_CONTROL    0x02
-#define UAC_EP_CS_ATTR_FILL_MAX     0x80
-
-/* status word format (3.7.1.1) */
-
-#define UAC1_STATUS_TYPE_ORIG_MASK      0x0f
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_CONTROL_IF  0x0
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_IF   0x1
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_EP   0x2
-
-#define UAC1_STATUS_TYPE_IRQ_PENDING        (1 << 7)
-#define UAC1_STATUS_TYPE_MEM_CHANGED        (1 << 6)
-
-struct uac1_status_word {
-    __u8 bStatusType;
-    __u8 bOriginator;
-} __attribute__((packed));
-
-
-#endif /* _UAPI__LINUX_USB_AUDIO_H */
diff --git a/components/drivers/usb/usbdevice/class/audio_mic.c b/components/drivers/usb/usbdevice/class/audio_mic.c
index 970294c1d8..81170b8a72 100644
--- a/components/drivers/usb/usbdevice/class/audio_mic.c
+++ b/components/drivers/usb/usbdevice/class/audio_mic.c
@@ -11,7 +11,8 @@
 #include <rthw.h>
 #include <rtdevice.h>
 #include "drivers/usb_device.h"
-#include "audio.h"
+
+#include "uaudioreg.h"
 
 #define DBG_TAG              "usbd.audio.mic"
 #define DBG_LVL              DBG_INFO
@@ -46,9 +47,6 @@
 #define UAC_MAX_PACKET_SIZE         64
 #define UAC_EP_MAX_PACKET_SIZE      32
 #define UAC_CHANNEL_NUM             RECORD_CHANNEL
-#define UAC_INTR_NUM                1
-#define UAC_CH_NUM                  1
-#define UAC_FORMAT_NUM              1
 
 struct uac_ac_descriptor
 {
@@ -56,21 +54,21 @@ struct uac_ac_descriptor
     struct uiad_descriptor iad_desc;
 #endif
     struct uinterface_descriptor intf_desc;
-    DECLARE_UAC_AC_HEADER_DESCRIPTOR(UAC_INTR_NUM) hdr_desc;
-    struct uac_input_terminal_descriptor it_desc;
-    struct uac1_output_terminal_descriptor ot_desc;
+    struct usb_audio_control_descriptor hdr_desc;
+    struct usb_audio_input_terminal it_desc;
+    struct usb_audio_output_terminal ot_desc;
 #if UAC_USE_FEATURE_UNIT
-    DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(UAC_CH_NUM) feature_unit_desc;
+    struct usb_audio_feature_unit feature_unit_desc;
 #endif
 };
 
 struct uac_as_descriptor
 {
     struct uinterface_descriptor intf_desc;
-    struct uac1_as_header_descriptor hdr_desc;
-    DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(UAC_FORMAT_NUM) format_type_desc;
+    struct usb_audio_streaming_interface_descriptor hdr_desc;
+    struct usb_audio_streaming_type1_descriptor format_type_desc;
     struct uendpoint_descriptor ep_desc;
-    struct uac_iso_endpoint_descriptor as_ep_desc;
+    struct usb_audio_streaming_endpoint_descriptor as_ep_desc;
 };
 
 /*
@@ -169,9 +167,9 @@ static struct uac_ac_descriptor ac_desc =
     },
     /* Header Descriptor */
     {
-        UAC_DT_AC_HEADER_SIZE(UAC_INTR_NUM),
+        sizeof(struct usb_audio_control_descriptor),
         UAC_CS_INTERFACE,
-        UAC_HEADER,
+        UDESCSUB_AC_HEADER,
         0x0100,    /* Version: 1.00 */
         0x001E,    /* Total length: 30 */
         0x01,      /* Total number of interfaces: 1 */
@@ -179,9 +177,9 @@ static struct uac_ac_descriptor ac_desc =
     },
     /*  Input Terminal Descriptor */
     {
-        UAC_DT_INPUT_TERMINAL_SIZE,
+        sizeof(struct usb_audio_input_terminal),
         UAC_CS_INTERFACE,
-        UAC_INPUT_TERMINAL,
+        UDESCSUB_AC_INPUT,
         0x01,      /* Terminal ID: 1 */
         0x0201,    /* Terminal Type: Microphone (0x0201) */
         0x00,      /* Assoc Terminal: 0 */
@@ -192,9 +190,9 @@ static struct uac_ac_descriptor ac_desc =
     },
     /*  Output Terminal Descriptor */
     {
-        UAC_DT_OUTPUT_TERMINAL_SIZE,
+        sizeof(struct usb_audio_output_terminal),
         UAC_CS_INTERFACE,
-        UAC_OUTPUT_TERMINAL,
+        UDESCSUB_AC_OUTPUT,
         0x02,      /* Terminal ID: 2 */
         0x0101,    /* Terminal Type: USB Streaming (0x0101) */
         0x00,      /* Assoc Terminal: 0 */
@@ -204,11 +202,12 @@ static struct uac_ac_descriptor ac_desc =
 #if UAC_USE_FEATURE_UNIT
     /*  Feature unit Descriptor */
     {
-        UAC_DT_FEATURE_UNIT_SIZE(UAC_CH_NUM),
+        sizeof(struct usb_audio_feature_unit),
         UAC_CS_INTERFACE,
-        UAC_FEATURE_UNIT,
+        UDESCSUB_AC_FEATURE,
         0x02,
-        0x0101,
+        0x01,
+        0x01,
         0x00,
         0x01,
     },
@@ -246,19 +245,19 @@ static struct uac_as_descriptor as_desc =
     },
     /* General AS Descriptor */
     {
-        UAC_DT_AS_HEADER_SIZE,
+        sizeof(struct usb_audio_streaming_interface_descriptor),
         UAC_CS_INTERFACE,
-        UAC_AS_GENERAL,
+        AS_GENERAL,
         0x02,      /* Terminal ID: 2 */
         0x01,      /* Interface delay in frames: 1 */
-        UAC_FORMAT_TYPE_I_PCM,
+        UA_FMT_PCM,
     },
     /* Format type i Descriptor */
     {
-        UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(UAC_FORMAT_NUM),
+        sizeof(struct usb_audio_streaming_type1_descriptor),
         UAC_CS_INTERFACE,
-        UAC_FORMAT_TYPE,
-        UAC_FORMAT_TYPE_I,
+        FORMAT_TYPE,
+        FORMAT_TYPE_I,
         UAC_CHANNEL_NUM,
         2,         /* Subframe Size: 2 */
         RESOLUTION_BITS,
@@ -276,9 +275,9 @@ static struct uac_as_descriptor as_desc =
     },
     /* AS Endpoint Descriptor */
     {
-        UAC_ISO_ENDPOINT_DESC_SIZE,
+        sizeof(struct usb_audio_streaming_endpoint_descriptor),
         UAC_CS_ENDPOINT,
-        UAC_MS_GENERAL,
+        AS_GENERAL,
     },
 };
 
@@ -476,9 +475,9 @@ static rt_err_t _uac_descriptor_config(struct uac_ac_descriptor *ac,
 
 static rt_err_t _uac_samplerate_config(struct uac_as_descriptor *as, rt_uint32_t samplerate)
 {
-    as->format_type_desc.tSamFreq[0][2] = samplerate >> 16 & 0xff;
-    as->format_type_desc.tSamFreq[0][1] = samplerate >> 8 & 0xff;
-    as->format_type_desc.tSamFreq[0][0] = samplerate & 0xff;
+    as->format_type_desc.tSamFreq[0 * 3 + 2] = samplerate >> 16 & 0xff;
+    as->format_type_desc.tSamFreq[0 * 3 + 1] = samplerate >> 8 & 0xff;
+    as->format_type_desc.tSamFreq[0 * 3 + 0] = samplerate & 0xff;
     return RT_EOK;
 }
 
diff --git a/components/drivers/usb/usbdevice/class/audio_speaker.c b/components/drivers/usb/usbdevice/class/audio_speaker.c
index 8171e7fd69..6148478c02 100644
--- a/components/drivers/usb/usbdevice/class/audio_speaker.c
+++ b/components/drivers/usb/usbdevice/class/audio_speaker.c
@@ -11,7 +11,9 @@
 #include <rthw.h>
 #include <rtdevice.h>
 #include "drivers/usb_device.h"
-#include "audio.h"
+
+#define AUFMT_MAX_FREQUENCIES       1
+#include "uaudioreg.h"
 
 #define DBG_TAG              "usbd.audio.speaker"
 #define DBG_LVL              DBG_INFO
@@ -46,9 +48,6 @@
 #define UAC_MAX_PACKET_SIZE         64
 #define UAC_EP_MAX_PACKET_SIZE      32
 #define UAC_CHANNEL_NUM             AUDIO_CHANNEL
-#define UAC_INTR_NUM                1
-#define UAC_CH_NUM                  1
-#define UAC_FORMAT_NUM              1
 
 struct uac_ac_descriptor
 {
@@ -56,21 +55,21 @@ struct uac_ac_descriptor
     struct uiad_descriptor iad_desc;
 #endif
     struct uinterface_descriptor intf_desc;
-    DECLARE_UAC_AC_HEADER_DESCRIPTOR(UAC_INTR_NUM) hdr_desc;
-    struct uac_input_terminal_descriptor it_desc;
-    struct uac1_output_terminal_descriptor ot_desc;
+    struct usb_audio_control_descriptor hdr_desc;
+    struct usb_audio_input_terminal it_desc;
+    struct usb_audio_output_terminal ot_desc;
 #if UAC_USE_FEATURE_UNIT
-    DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(UAC_CH_NUM) feature_unit_desc;
+    struct usb_audio_feature_unit feature_unit_desc;
 #endif
 };
 
 struct uac_as_descriptor
 {
     struct uinterface_descriptor intf_desc;
-    struct uac1_as_header_descriptor hdr_desc;
-    DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(UAC_FORMAT_NUM) format_type_desc;
+    struct usb_audio_streaming_interface_descriptor hdr_desc;
+    struct usb_audio_streaming_type1_descriptor format_type_desc;
     struct uendpoint_descriptor ep_desc;
-    struct uac_iso_endpoint_descriptor as_ep_desc;
+    struct usb_audio_streaming_endpoint_descriptor as_ep_desc;
 };
 
 /*
@@ -169,9 +168,9 @@ static struct uac_ac_descriptor ac_desc =
     },
     /* Header Descriptor */
     {
-        UAC_DT_AC_HEADER_SIZE(UAC_INTR_NUM),
+        sizeof(struct usb_audio_control_descriptor),
         UAC_CS_INTERFACE,
-        UAC_HEADER,
+        UDESCSUB_AC_HEADER,
         0x0100,    /* Version: 1.00 */
         0x0027,    /* Total length: 39 */
         0x01,      /* Total number of interfaces: 1 */
@@ -179,9 +178,9 @@ static struct uac_ac_descriptor ac_desc =
     },
     /*  Input Terminal Descriptor */
     {
-        UAC_DT_INPUT_TERMINAL_SIZE,
+        sizeof(struct usb_audio_input_terminal),
         UAC_CS_INTERFACE,
-        UAC_INPUT_TERMINAL,
+        UDESCSUB_AC_INPUT,
         0x01,      /* Terminal ID: 1 */
         0x0101,    /* Terminal Type: USB Streaming (0x0101) */
         0x00,      /* Assoc Terminal: 0 */
@@ -192,9 +191,9 @@ static struct uac_ac_descriptor ac_desc =
     },
     /*  Output Terminal Descriptor */
     {
-        UAC_DT_OUTPUT_TERMINAL_SIZE,
+        sizeof(struct usb_audio_output_terminal),
         UAC_CS_INTERFACE,
-        UAC_OUTPUT_TERMINAL,
+        UDESCSUB_AC_OUTPUT,
         0x02,      /* Terminal ID: 2 */
         0x0302,    /* Terminal Type: Headphones (0x0302) */
         0x00,      /* Assoc Terminal: 0 */
@@ -246,19 +245,19 @@ static struct uac_as_descriptor as_desc =
     },
     /* General AS Descriptor */
     {
-        UAC_DT_AS_HEADER_SIZE,
+        sizeof(struct usb_audio_streaming_interface_descriptor),
         UAC_CS_INTERFACE,
-        UAC_AS_GENERAL,
+        AS_GENERAL,
         0x01,      /* Terminal ID: 1 */
         0x01,      /* Interface delay in frames: 1 */
-        UAC_FORMAT_TYPE_I_PCM,
+        UA_FMT_PCM,
     },
     /* Format type i Descriptor */
     {
-        UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(UAC_FORMAT_NUM),
+        sizeof(struct usb_audio_streaming_type1_descriptor),
         UAC_CS_INTERFACE,
-        UAC_FORMAT_TYPE,
-        UAC_FORMAT_TYPE_I,
+        FORMAT_TYPE,
+        FORMAT_TYPE_I,
         UAC_CHANNEL_NUM,
         2,         /* Subframe Size: 2 */
         RESOLUTION_BITS,
@@ -276,9 +275,9 @@ static struct uac_as_descriptor as_desc =
     },
     /* AS Endpoint Descriptor */
     {
-        UAC_ISO_ENDPOINT_DESC_SIZE,
+        sizeof(struct usb_audio_streaming_endpoint_descriptor),
         UAC_CS_ENDPOINT,
-        UAC_MS_GENERAL,
+        AS_GENERAL,
     },
 };
 
@@ -477,9 +476,9 @@ static rt_err_t _uac_descriptor_config(struct uac_ac_descriptor *ac,
 
 static rt_err_t _uac_samplerate_config(struct uac_as_descriptor *as, rt_uint32_t samplerate)
 {
-    as->format_type_desc.tSamFreq[0][2] = samplerate >> 16 & 0xff;
-    as->format_type_desc.tSamFreq[0][1] = samplerate >> 8 & 0xff;
-    as->format_type_desc.tSamFreq[0][0] = samplerate & 0xff;
+    as->format_type_desc.tSamFreq[0 * 3 + 2] = samplerate >> 16 & 0xff;
+    as->format_type_desc.tSamFreq[0 * 3 + 1] = samplerate >> 8 & 0xff;
+    as->format_type_desc.tSamFreq[0 * 3 + 0] = samplerate & 0xff;
     return RT_EOK;
 }
 
diff --git a/components/drivers/usb/usbdevice/class/uaudioreg.h b/components/drivers/usb/usbdevice/class/uaudioreg.h
new file mode 100644
index 0000000000..6ed8614c39
--- /dev/null
+++ b/components/drivers/usb/usbdevice/class/uaudioreg.h
@@ -0,0 +1,418 @@
+/*  $NetBSD: uaudioreg.h,v 1.15.38.1 2012/06/02 11:09:29 mrg Exp $  */
+
+/*
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson ([email protected]) at
+ * Carlstedt Research & Technology.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <rtdef.h>
+
+typedef uint8_t  uByte;
+typedef uint16_t uWord;
+
+#define UPACKED __attribute__ ((packed))
+
+#define UAUDIO_VERSION      0x100
+
+#define USB_SUBCLASS_AUDIOCONTROL    1
+#define USB_SUBCLASS_AUDIOSTREAMING  2
+#define USB_SUBCLASS_AUDIOMIDISTREAM 3
+
+#define UDESC_CS_CONFIG     0x22
+#define UDESC_CS_STRING     0x23
+#define UDESC_CS_INTERFACE  0x24
+#define UDESC_CS_ENDPOINT   0x25
+
+#define UDESCSUB_AC_HEADER      1
+#define UDESCSUB_AC_INPUT       2
+#define UDESCSUB_AC_OUTPUT      3
+#define UDESCSUB_AC_MIXER       4
+#define UDESCSUB_AC_SELECTOR    5
+#define UDESCSUB_AC_FEATURE     6
+#define UDESCSUB_AC_PROCESSING  7
+#define UDESCSUB_AC_EXTENSION   8
+
+#ifndef AUFMT_MAX_FREQUENCIES
+#define AUFMT_MAX_FREQUENCIES   1
+#endif
+
+/* The first fields are identical to usb_endpoint_descriptor_t */
+typedef struct {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bEndpointAddress;
+    uByte       bmAttributes;
+    uWord       wMaxPacketSize;
+    uByte       bInterval;
+    /*
+     * The following two entries are only used by the Audio Class.
+     * And according to the specs the Audio Class is the only one
+     * allowed to extend the endpoint descriptor.
+     * Who knows what goes on in the minds of the people in the USB
+     * standardization?  :-(
+     */
+    uByte       bRefresh;
+    uByte       bSynchAddress;
+} UPACKED usb_endpoint_descriptor_audio_t;
+
+/* generic, for iteration */
+typedef struct {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+} UPACKED uaudio_cs_descriptor_t;
+
+struct usb_audio_control_descriptor {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uWord       bcdADC;
+    uWord       wTotalLength;
+    uByte       bInCollection;
+    uByte       baInterfaceNr[1];
+} UPACKED;
+
+struct usb_audio_streaming_interface_descriptor {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bTerminalLink;
+    uByte       bDelay;
+    uWord       wFormatTag;
+} UPACKED;
+
+struct usb_audio_streaming_endpoint_descriptor {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bmAttributes;
+#define UA_SED_FREQ_CONTROL 0x01
+#define UA_SED_PITCH_CONTROL    0x02
+#define UA_SED_MAXPACKETSONLY   0x80
+    uByte       bLockDelayUnits;
+    uWord       wLockDelay;
+} UPACKED;
+
+struct usb_audio_streaming_type1_descriptor {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bFormatType;
+    uByte       bNrChannels;
+    uByte       bSubFrameSize;
+    uByte       bBitResolution;
+    uByte       bSamFreqType;
+#define UA_SAMP_CONTNUOUS 0
+    uByte       tSamFreq[3*AUFMT_MAX_FREQUENCIES];
+#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16))
+#define UA_SAMP_LO(p) UA_GETSAMP(p, 0)
+#define UA_SAMP_HI(p) UA_GETSAMP(p, 1)
+} UPACKED;
+
+struct usb_audio_cluster {
+    uByte       bNrChannels;
+    uWord       wChannelConfig;
+#define UA_CHANNEL_LEFT     0x0001
+#define UA_CHANNEL_RIGHT    0x0002
+#define UA_CHANNEL_CENTER   0x0004
+#define UA_CHANNEL_LFE      0x0008
+#define UA_CHANNEL_L_SURROUND   0x0010
+#define UA_CHANNEL_R_SURROUND   0x0020
+#define UA_CHANNEL_L_CENTER 0x0040
+#define UA_CHANNEL_R_CENTER 0x0080
+#define UA_CHANNEL_SURROUND 0x0100
+#define UA_CHANNEL_L_SIDE   0x0200
+#define UA_CHANNEL_R_SIDE   0x0400
+#define UA_CHANNEL_TOP      0x0800
+    uByte       iChannelNames;
+} UPACKED;
+
+/* Shared by all units and terminals */
+struct usb_audio_unit {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bUnitId;
+};
+
+/* UDESCSUB_AC_INPUT */
+struct usb_audio_input_terminal {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bTerminalId;
+    uWord       wTerminalType;
+    uByte       bAssocTerminal;
+    uByte       bNrChannels;
+    uWord       wChannelConfig;
+    uByte       iChannelNames;
+    uByte       iTerminal;
+} UPACKED;
+
+/* UDESCSUB_AC_OUTPUT */
+struct usb_audio_output_terminal {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bTerminalId;
+    uWord       wTerminalType;
+    uByte       bAssocTerminal;
+    uByte       bSourceId;
+    uByte       iTerminal;
+} UPACKED;
+
+/* UDESCSUB_AC_MIXER */
+struct usb_audio_mixer_unit {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bUnitId;
+    uByte       bNrInPins;
+    uByte       baSourceId[255]; /* [bNrInPins] */
+    /* struct usb_audio_mixer_unit_1 */
+} UPACKED;
+struct usb_audio_mixer_unit_1 {
+    uByte       bNrChannels;
+    uWord       wChannelConfig;
+    uByte       iChannelNames;
+    uByte       bmControls[255]; /* [bNrChannels] */
+    /*uByte     iMixer;*/
+} UPACKED;
+
+/* UDESCSUB_AC_SELECTOR */
+struct usb_audio_selector_unit {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bUnitId;
+    uByte       bNrInPins;
+    uByte       baSourceId[255]; /* [bNrInPins] */
+    /* uByte    iSelector; */
+} UPACKED;
+
+/* UDESCSUB_AC_FEATURE */
+struct usb_audio_feature_unit {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bUnitId;
+    uByte       bSourceId;
+    uByte       bControlSize;
+    uByte       bmaControls[2]; /* size for more than enough */
+    /* uByte    iFeature; */
+} UPACKED;
+
+/* UDESCSUB_AC_PROCESSING */
+struct usb_audio_processing_unit {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bUnitId;
+    uWord       wProcessType;
+    uByte       bNrInPins;
+    uByte       baSourceId[255]; /* [bNrInPins] */
+    /* struct usb_audio_processing_unit_1 */
+} UPACKED;
+struct usb_audio_processing_unit_1{
+    uByte       bNrChannels;
+    uWord       wChannelConfig;
+    uByte       iChannelNames;
+    uByte       bControlSize;
+    uByte       bmControls[255]; /* [bControlSize] */
+#define UA_PROC_ENABLE_MASK 1
+} UPACKED;
+
+struct usb_audio_processing_unit_updown {
+    uByte       iProcessing;
+    uByte       bNrModes;
+    uWord       waModes[255]; /* [bNrModes] */
+} UPACKED;
+
+/* UDESCSUB_AC_EXTENSION */
+struct usb_audio_extension_unit {
+    uByte       bLength;
+    uByte       bDescriptorType;
+    uByte       bDescriptorSubtype;
+    uByte       bUnitId;
+    uWord       wExtensionCode;
+    uByte       bNrInPins;
+    uByte       baSourceId[255]; /* [bNrInPins] */
+    /* struct usb_audio_extension_unit_1 */
+} UPACKED;
+struct usb_audio_extension_unit_1 {
+    uByte       bNrChannels;
+    uWord       wChannelConfig;
+    uByte       iChannelNames;
+    uByte       bControlSize;
+    uByte       bmControls[255]; /* [bControlSize] */
+#define UA_EXT_ENABLE_MASK 1
+#define UA_EXT_ENABLE 1
+    /*uByte     iExtension;*/
+} UPACKED;
+
+/* USB terminal types */
+#define UAT_UNDEFINED       0x0100
+#define UAT_STREAM      0x0101
+#define UAT_VENDOR      0x01ff
+/* input terminal types */
+#define UATI_UNDEFINED      0x0200
+#define UATI_MICROPHONE     0x0201
+#define UATI_DESKMICROPHONE 0x0202
+#define UATI_PERSONALMICROPHONE 0x0203
+#define UATI_OMNIMICROPHONE 0x0204
+#define UATI_MICROPHONEARRAY    0x0205
+#define UATI_PROCMICROPHONEARR  0x0206
+/* output terminal types */
+#define UATO_UNDEFINED      0x0300
+#define UATO_SPEAKER        0x0301
+#define UATO_HEADPHONES     0x0302
+#define UATO_DISPLAYAUDIO   0x0303
+#define UATO_DESKTOPSPEAKER 0x0304
+#define UATO_ROOMSPEAKER    0x0305
+#define UATO_COMMSPEAKER    0x0306
+#define UATO_SUBWOOFER      0x0307
+/* bidir terminal types */
+#define UATB_UNDEFINED      0x0400
+#define UATB_HANDSET        0x0401
+#define UATB_HEADSET        0x0402
+#define UATB_SPEAKERPHONE   0x0403
+#define UATB_SPEAKERPHONEESUP   0x0404
+#define UATB_SPEAKERPHONEECANC  0x0405
+/* telephony terminal types */
+#define UATT_UNDEFINED      0x0500
+#define UATT_PHONELINE      0x0501
+#define UATT_TELEPHONE      0x0502
+#define UATT_DOWNLINEPHONE  0x0503
+/* external terminal types */
+#define UATE_UNDEFINED      0x0600
+#define UATE_ANALOGCONN     0x0601
+#define UATE_DIGITALAUIFC   0x0602
+#define UATE_LINECONN       0x0603
+#define UATE_LEGACYCONN     0x0604
+#define UATE_SPDIF      0x0605
+#define UATE_1394DA     0x0606
+#define UATE_1394DV     0x0607
+/* embedded function terminal types */
+#define UATF_UNDEFINED      0x0700
+#define UATF_CALIBNOISE     0x0701
+#define UATF_EQUNOISE       0x0702
+#define UATF_CDPLAYER       0x0703
+#define UATF_DAT        0x0704
+#define UATF_DCC        0x0705
+#define UATF_MINIDISK       0x0706
+#define UATF_ANALOGTAPE     0x0707
+#define UATF_PHONOGRAPH     0x0708
+#define UATF_VCRAUDIO       0x0709
+#define UATF_VIDEODISCAUDIO 0x070a
+#define UATF_DVDAUDIO       0x070b
+#define UATF_TVTUNERAUDIO   0x070c
+#define UATF_SATELLITE      0x070d
+#define UATF_CABLETUNER     0x070e
+#define UATF_DSS        0x070f
+#define UATF_RADIORECV      0x0710
+#define UATF_RADIOXMIT      0x0711
+#define UATF_MULTITRACK     0x0712
+#define UATF_SYNTHESIZER    0x0713
+
+
+#define SET_CUR 0x01
+#define GET_CUR 0x81
+#define SET_MIN 0x02
+#define GET_MIN 0x82
+#define SET_MAX 0x03
+#define GET_MAX 0x83
+#define SET_RES 0x04
+#define GET_RES 0x84
+#define SET_MEM 0x05
+#define GET_MEM 0x85
+#define GET_STAT 0xff
+
+#define MUTE_CONTROL    0x01
+#define VOLUME_CONTROL  0x02
+#define BASS_CONTROL    0x03
+#define MID_CONTROL 0x04
+#define TREBLE_CONTROL  0x05
+#define GRAPHIC_EQUALIZER_CONTROL   0x06
+#define AGC_CONTROL 0x07
+#define DELAY_CONTROL   0x08
+#define BASS_BOOST_CONTROL 0x09
+#define LOUDNESS_CONTROL 0x0a
+
+#define FU_MASK(u) (1 << ((u)-1))
+
+#define MASTER_CHAN 0
+
+#define AS_GENERAL  1
+#define FORMAT_TYPE 2
+#define FORMAT_SPECIFIC 3
+
+#define UA_FMT_PCM  1
+#define UA_FMT_PCM8 2
+#define UA_FMT_IEEE_FLOAT 3
+#define UA_FMT_ALAW 4
+#define UA_FMT_MULAW    5
+#define UA_FMT_MPEG 0x1001
+#define UA_FMT_AC3  0x1002
+
+#define SAMPLING_FREQ_CONTROL   0x01
+#define PITCH_CONTROL       0x02
+
+#define FORMAT_TYPE_UNDEFINED 0
+#define FORMAT_TYPE_I 1
+#define FORMAT_TYPE_II 2
+#define FORMAT_TYPE_III 3
+
+#define UA_PROC_MASK(n) (1<< ((n)-1))
+#define PROCESS_UNDEFINED       0
+#define  XX_ENABLE_CONTROL          1
+#define UPDOWNMIX_PROCESS       1
+#define  UD_ENABLE_CONTROL          1
+#define  UD_MODE_SELECT_CONTROL         2
+#define DOLBY_PROLOGIC_PROCESS      2
+#define  DP_ENABLE_CONTROL          1
+#define  DP_MODE_SELECT_CONTROL         2
+#define P3D_STEREO_EXTENDER_PROCESS 3
+#define  P3D_ENABLE_CONTROL         1
+#define  P3D_SPACIOUSNESS_CONTROL       2
+#define REVERBATION_PROCESS     4
+#define  RV_ENABLE_CONTROL          1
+#define  RV_LEVEL_CONTROL           2
+#define  RV_TIME_CONTROL            3
+#define  RV_FEEDBACK_CONTROL            4
+#define CHORUS_PROCESS          5
+#define  CH_ENABLE_CONTROL          1
+#define  CH_LEVEL_CONTROL           2
+#define  CH_RATE_CONTROL            3
+#define  CH_DEPTH_CONTROL           4
+#define DYN_RANGE_COMP_PROCESS      6
+#define  DR_ENABLE_CONTROL          1
+#define  DR_COMPRESSION_RATE_CONTROL        2
+#define  DR_MAXAMPL_CONTROL         3
+#define  DR_THRESHOLD_CONTROL           4
+#define  DR_ATTACK_TIME_CONTROL         5
+#define  DR_RELEASE_TIME_CONTROL        6