usb: gadget: function: make current f_uac1 implementation legacy
authorRuslan Bilovol <ruslan.bilovol@gmail.com>
Sun, 18 Jun 2017 13:23:53 +0000 (16:23 +0300)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Mon, 19 Jun 2017 06:22:47 +0000 (09:22 +0300)
Before introducing new f_uac1 function (with virtual
ALSA card) make current implementation legacy.

This includes renaming of existing files, some
variables, config options and documentation

Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
13 files changed:
Documentation/ABI/testing/configfs-usb-gadget-uac1 [deleted file]
Documentation/ABI/testing/configfs-usb-gadget-uac1_legacy [new file with mode: 0644]
Documentation/usb/gadget-testing.txt
drivers/usb/gadget/Kconfig
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/function/f_uac1.c [deleted file]
drivers/usb/gadget/function/f_uac1_legacy.c [new file with mode: 0644]
drivers/usb/gadget/function/u_uac1.c [deleted file]
drivers/usb/gadget/function/u_uac1.h [deleted file]
drivers/usb/gadget/function/u_uac1_legacy.c [new file with mode: 0644]
drivers/usb/gadget/function/u_uac1_legacy.h [new file with mode: 0644]
drivers/usb/gadget/legacy/Kconfig
drivers/usb/gadget/legacy/audio.c

diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uac1 b/Documentation/ABI/testing/configfs-usb-gadget-uac1
deleted file mode 100644 (file)
index 8ba9a12..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-What:          /config/usb-gadget/gadget/functions/uac1.name
-Date:          Sep 2014
-KernelVersion: 3.18
-Description:
-               The attributes:
-
-               audio_buf_size - audio buffer size
-               fn_cap - capture pcm device file name
-               fn_cntl - control device file name
-               fn_play - playback pcm device file name
-               req_buf_size - ISO OUT endpoint request buffer size
-               req_count - ISO OUT endpoint request count
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uac1_legacy b/Documentation/ABI/testing/configfs-usb-gadget-uac1_legacy
new file mode 100644 (file)
index 0000000..b2eaefd
--- /dev/null
@@ -0,0 +1,12 @@
+What:          /config/usb-gadget/gadget/functions/uac1_legacy.name
+Date:          Sep 2014
+KernelVersion: 3.18
+Description:
+               The attributes:
+
+               audio_buf_size - audio buffer size
+               fn_cap - capture pcm device file name
+               fn_cntl - control device file name
+               fn_play - playback pcm device file name
+               req_buf_size - ISO OUT endpoint request buffer size
+               req_count - ISO OUT endpoint request count
index fb0cc4df17655b6d224341b3915afbf4acdd1a89..ce51d6e4e7d0f7b24a5d96f243e9ae7ae6f4d32b 100644 (file)
@@ -16,7 +16,7 @@ provided by gadgets.
 13. RNDIS function
 14. SERIAL function
 15. SOURCESINK function
-16. UAC1 function
+16. UAC1 function (legacy implementation)
 17. UAC2 function
 18. UVC function
 19. PRINTER function
@@ -589,15 +589,16 @@ device: run the gadget
 host: test-usb (tools/usb/testusb.c)
 
 
-16. UAC1 function
+16. UAC1 function (legacy implementation)
 =================
 
-The function is provided by usb_f_uac1.ko module.
+The function is provided by usb_f_uac1_legacy.ko module.
 
 Function-specific configfs interface
 ------------------------------------
 
-The function name to use when creating the function directory is "uac1".
+The function name to use when creating the function directory
+is "uac1_legacy".
 The uac1 function provides these attributes in its function directory:
 
        audio_buf_size - audio buffer size
index 3b0ffd6e515b774b4b42369b2051cd06ea41cb03..01c2e2b9ab1dcc66df111012cd043c3e720b37cb 100644 (file)
@@ -191,7 +191,7 @@ config USB_F_MASS_STORAGE
 config USB_F_FS
        tristate
 
-config USB_F_UAC1
+config USB_F_UAC1_LEGACY
        tristate
 
 config USB_F_UAC2
@@ -365,13 +365,13 @@ config USB_CONFIGFS_F_FS
          implemented in kernel space (for instance Ethernet, serial or
          mass storage) and other are implemented in user space.
 
-config USB_CONFIGFS_F_UAC1
-       bool "Audio Class 1.0"
+config USB_CONFIGFS_F_UAC1_LEGACY
+       bool "Audio Class 1.0 (legacy implementation)"
        depends on USB_CONFIGFS
        depends on SND
        select USB_LIBCOMPOSITE
        select SND_PCM
-       select USB_F_UAC1
+       select USB_F_UAC1_LEGACY
        help
          This Audio function implements 1 AudioControl interface,
          1 AudioStreaming Interface each for USB-OUT and USB-IN.
index b29f2ae233578b6d5c3d217c7b532bc6cca78a9d..50ee517faf74449b0baeb59e6f5c9725713b8a67 100644 (file)
@@ -33,8 +33,8 @@ obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
 usb_f_fs-y                     := f_fs.o
 obj-$(CONFIG_USB_F_FS)         += usb_f_fs.o
 obj-$(CONFIG_USB_U_AUDIO)      += u_audio.o
-usb_f_uac1-y                   := f_uac1.o u_uac1.o
-obj-$(CONFIG_USB_F_UAC1)       += usb_f_uac1.o
+usb_f_uac1_legacy-y            := f_uac1_legacy.o u_uac1_legacy.o
+obj-$(CONFIG_USB_F_UAC1_LEGACY)        += usb_f_uac1_legacy.o
 usb_f_uac2-y                   := f_uac2.o
 obj-$(CONFIG_USB_F_UAC2)       += usb_f_uac2.o
 usb_f_uvc-y                    := f_uvc.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_configfs.o
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
deleted file mode 100644 (file)
index 5dfc94b..0000000
+++ /dev/null
@@ -1,1020 +0,0 @@
-/*
- * f_audio.c -- USB Audio class function driver
-  *
- * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
- * Copyright (C) 2008 Analog Devices, Inc
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/atomic.h>
-
-#include "u_uac1.h"
-
-static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value);
-static int generic_get_cmd(struct usb_audio_control *con, u8 cmd);
-
-/*
- * DESCRIPTORS ... most are static, but strings and full
- * configuration descriptors are built on demand.
- */
-
-/*
- * We have two interfaces- AudioControl and AudioStreaming
- * TODO: only supcard playback currently
- */
-#define F_AUDIO_AC_INTERFACE   0
-#define F_AUDIO_AS_INTERFACE   1
-#define F_AUDIO_NUM_INTERFACES 1
-
-/* B.3.1  Standard AC Interface Descriptor */
-static struct usb_interface_descriptor ac_interface_desc = {
-       .bLength =              USB_DT_INTERFACE_SIZE,
-       .bDescriptorType =      USB_DT_INTERFACE,
-       .bNumEndpoints =        0,
-       .bInterfaceClass =      USB_CLASS_AUDIO,
-       .bInterfaceSubClass =   USB_SUBCLASS_AUDIOCONTROL,
-};
-
-/*
- * The number of AudioStreaming and MIDIStreaming interfaces
- * in the Audio Interface Collection
- */
-DECLARE_UAC_AC_HEADER_DESCRIPTOR(1);
-
-#define UAC_DT_AC_HEADER_LENGTH        UAC_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
-/* 1 input terminal, 1 output terminal and 1 feature unit */
-#define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \
-       + UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))
-/* B.3.2  Class-Specific AC Interface Descriptor */
-static struct uac1_ac_header_descriptor_1 ac_header_desc = {
-       .bLength =              UAC_DT_AC_HEADER_LENGTH,
-       .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   UAC_HEADER,
-       .bcdADC =               __constant_cpu_to_le16(0x0100),
-       .wTotalLength =         __constant_cpu_to_le16(UAC_DT_TOTAL_LENGTH),
-       .bInCollection =        F_AUDIO_NUM_INTERFACES,
-       .baInterfaceNr = {
-       /* Interface number of the first AudioStream interface */
-               [0] =           1,
-       }
-};
-
-#define INPUT_TERMINAL_ID      1
-static struct uac_input_terminal_descriptor input_terminal_desc = {
-       .bLength =              UAC_DT_INPUT_TERMINAL_SIZE,
-       .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   UAC_INPUT_TERMINAL,
-       .bTerminalID =          INPUT_TERMINAL_ID,
-       .wTerminalType =        UAC_TERMINAL_STREAMING,
-       .bAssocTerminal =       0,
-       .wChannelConfig =       0x3,
-};
-
-DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(0);
-
-#define FEATURE_UNIT_ID                2
-static struct uac_feature_unit_descriptor_0 feature_unit_desc = {
-       .bLength                = UAC_DT_FEATURE_UNIT_SIZE(0),
-       .bDescriptorType        = USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype     = UAC_FEATURE_UNIT,
-       .bUnitID                = FEATURE_UNIT_ID,
-       .bSourceID              = INPUT_TERMINAL_ID,
-       .bControlSize           = 2,
-       .bmaControls[0]         = (UAC_FU_MUTE | UAC_FU_VOLUME),
-};
-
-static struct usb_audio_control mute_control = {
-       .list = LIST_HEAD_INIT(mute_control.list),
-       .name = "Mute Control",
-       .type = UAC_FU_MUTE,
-       /* Todo: add real Mute control code */
-       .set = generic_set_cmd,
-       .get = generic_get_cmd,
-};
-
-static struct usb_audio_control volume_control = {
-       .list = LIST_HEAD_INIT(volume_control.list),
-       .name = "Volume Control",
-       .type = UAC_FU_VOLUME,
-       /* Todo: add real Volume control code */
-       .set = generic_set_cmd,
-       .get = generic_get_cmd,
-};
-
-static struct usb_audio_control_selector feature_unit = {
-       .list = LIST_HEAD_INIT(feature_unit.list),
-       .id = FEATURE_UNIT_ID,
-       .name = "Mute & Volume Control",
-       .type = UAC_FEATURE_UNIT,
-       .desc = (struct usb_descriptor_header *)&feature_unit_desc,
-};
-
-#define OUTPUT_TERMINAL_ID     3
-static struct uac1_output_terminal_descriptor output_terminal_desc = {
-       .bLength                = UAC_DT_OUTPUT_TERMINAL_SIZE,
-       .bDescriptorType        = USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype     = UAC_OUTPUT_TERMINAL,
-       .bTerminalID            = OUTPUT_TERMINAL_ID,
-       .wTerminalType          = UAC_OUTPUT_TERMINAL_SPEAKER,
-       .bAssocTerminal         = FEATURE_UNIT_ID,
-       .bSourceID              = FEATURE_UNIT_ID,
-};
-
-/* B.4.1  Standard AS Interface Descriptor */
-static struct usb_interface_descriptor as_interface_alt_0_desc = {
-       .bLength =              USB_DT_INTERFACE_SIZE,
-       .bDescriptorType =      USB_DT_INTERFACE,
-       .bAlternateSetting =    0,
-       .bNumEndpoints =        0,
-       .bInterfaceClass =      USB_CLASS_AUDIO,
-       .bInterfaceSubClass =   USB_SUBCLASS_AUDIOSTREAMING,
-};
-
-static struct usb_interface_descriptor as_interface_alt_1_desc = {
-       .bLength =              USB_DT_INTERFACE_SIZE,
-       .bDescriptorType =      USB_DT_INTERFACE,
-       .bAlternateSetting =    1,
-       .bNumEndpoints =        1,
-       .bInterfaceClass =      USB_CLASS_AUDIO,
-       .bInterfaceSubClass =   USB_SUBCLASS_AUDIOSTREAMING,
-};
-
-/* B.4.2  Class-Specific AS Interface Descriptor */
-static struct uac1_as_header_descriptor as_header_desc = {
-       .bLength =              UAC_DT_AS_HEADER_SIZE,
-       .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   UAC_AS_GENERAL,
-       .bTerminalLink =        INPUT_TERMINAL_ID,
-       .bDelay =               1,
-       .wFormatTag =           UAC_FORMAT_TYPE_I_PCM,
-};
-
-DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(1);
-
-static struct uac_format_type_i_discrete_descriptor_1 as_type_i_desc = {
-       .bLength =              UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1),
-       .bDescriptorType =      USB_DT_CS_INTERFACE,
-       .bDescriptorSubtype =   UAC_FORMAT_TYPE,
-       .bFormatType =          UAC_FORMAT_TYPE_I,
-       .bSubframeSize =        2,
-       .bBitResolution =       16,
-       .bSamFreqType =         1,
-};
-
-/* Standard ISO OUT Endpoint Descriptor */
-static struct usb_endpoint_descriptor as_out_ep_desc  = {
-       .bLength =              USB_DT_ENDPOINT_AUDIO_SIZE,
-       .bDescriptorType =      USB_DT_ENDPOINT,
-       .bEndpointAddress =     USB_DIR_OUT,
-       .bmAttributes =         USB_ENDPOINT_SYNC_ADAPTIVE
-                               | USB_ENDPOINT_XFER_ISOC,
-       .wMaxPacketSize =       cpu_to_le16(UAC1_OUT_EP_MAX_PACKET_SIZE),
-       .bInterval =            4,
-};
-
-/* Class-specific AS ISO OUT Endpoint Descriptor */
-static struct uac_iso_endpoint_descriptor as_iso_out_desc = {
-       .bLength =              UAC_ISO_ENDPOINT_DESC_SIZE,
-       .bDescriptorType =      USB_DT_CS_ENDPOINT,
-       .bDescriptorSubtype =   UAC_EP_GENERAL,
-       .bmAttributes =         1,
-       .bLockDelayUnits =      1,
-       .wLockDelay =           __constant_cpu_to_le16(1),
-};
-
-static struct usb_descriptor_header *f_audio_desc[] = {
-       (struct usb_descriptor_header *)&ac_interface_desc,
-       (struct usb_descriptor_header *)&ac_header_desc,
-
-       (struct usb_descriptor_header *)&input_terminal_desc,
-       (struct usb_descriptor_header *)&output_terminal_desc,
-       (struct usb_descriptor_header *)&feature_unit_desc,
-
-       (struct usb_descriptor_header *)&as_interface_alt_0_desc,
-       (struct usb_descriptor_header *)&as_interface_alt_1_desc,
-       (struct usb_descriptor_header *)&as_header_desc,
-
-       (struct usb_descriptor_header *)&as_type_i_desc,
-
-       (struct usb_descriptor_header *)&as_out_ep_desc,
-       (struct usb_descriptor_header *)&as_iso_out_desc,
-       NULL,
-};
-
-enum {
-       STR_AC_IF,
-       STR_INPUT_TERMINAL,
-       STR_INPUT_TERMINAL_CH_NAMES,
-       STR_FEAT_DESC_0,
-       STR_OUTPUT_TERMINAL,
-       STR_AS_IF_ALT0,
-       STR_AS_IF_ALT1,
-};
-
-static struct usb_string strings_uac1[] = {
-       [STR_AC_IF].s = "AC Interface",
-       [STR_INPUT_TERMINAL].s = "Input terminal",
-       [STR_INPUT_TERMINAL_CH_NAMES].s = "Channels",
-       [STR_FEAT_DESC_0].s = "Volume control & mute",
-       [STR_OUTPUT_TERMINAL].s = "Output terminal",
-       [STR_AS_IF_ALT0].s = "AS Interface",
-       [STR_AS_IF_ALT1].s = "AS Interface",
-       { },
-};
-
-static struct usb_gadget_strings str_uac1 = {
-       .language = 0x0409,     /* en-us */
-       .strings = strings_uac1,
-};
-
-static struct usb_gadget_strings *uac1_strings[] = {
-       &str_uac1,
-       NULL,
-};
-
-/*
- * This function is an ALSA sound card following USB Audio Class Spec 1.0.
- */
-
-/*-------------------------------------------------------------------------*/
-struct f_audio_buf {
-       u8 *buf;
-       int actual;
-       struct list_head list;
-};
-
-static struct f_audio_buf *f_audio_buffer_alloc(int buf_size)
-{
-       struct f_audio_buf *copy_buf;
-
-       copy_buf = kzalloc(sizeof *copy_buf, GFP_ATOMIC);
-       if (!copy_buf)
-               return ERR_PTR(-ENOMEM);
-
-       copy_buf->buf = kzalloc(buf_size, GFP_ATOMIC);
-       if (!copy_buf->buf) {
-               kfree(copy_buf);
-               return ERR_PTR(-ENOMEM);
-       }
-
-       return copy_buf;
-}
-
-static void f_audio_buffer_free(struct f_audio_buf *audio_buf)
-{
-       kfree(audio_buf->buf);
-       kfree(audio_buf);
-}
-/*-------------------------------------------------------------------------*/
-
-struct f_audio {
-       struct gaudio                   card;
-
-       u8 ac_intf, ac_alt;
-       u8 as_intf, as_alt;
-
-       /* endpoints handle full and/or high speeds */
-       struct usb_ep                   *out_ep;
-
-       spinlock_t                      lock;
-       struct f_audio_buf *copy_buf;
-       struct work_struct playback_work;
-       struct list_head play_queue;
-
-       /* Control Set command */
-       struct list_head cs;
-       u8 set_cmd;
-       struct usb_audio_control *set_con;
-};
-
-static inline struct f_audio *func_to_audio(struct usb_function *f)
-{
-       return container_of(f, struct f_audio, card.func);
-}
-
-/*-------------------------------------------------------------------------*/
-
-static void f_audio_playback_work(struct work_struct *data)
-{
-       struct f_audio *audio = container_of(data, struct f_audio,
-                                       playback_work);
-       struct f_audio_buf *play_buf;
-
-       spin_lock_irq(&audio->lock);
-       if (list_empty(&audio->play_queue)) {
-               spin_unlock_irq(&audio->lock);
-               return;
-       }
-       play_buf = list_first_entry(&audio->play_queue,
-                       struct f_audio_buf, list);
-       list_del(&play_buf->list);
-       spin_unlock_irq(&audio->lock);
-
-       u_audio_playback(&audio->card, play_buf->buf, play_buf->actual);
-       f_audio_buffer_free(play_buf);
-}
-
-static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)
-{
-       struct f_audio *audio = req->context;
-       struct usb_composite_dev *cdev = audio->card.func.config->cdev;
-       struct f_audio_buf *copy_buf = audio->copy_buf;
-       struct f_uac1_opts *opts;
-       int audio_buf_size;
-       int err;
-
-       opts = container_of(audio->card.func.fi, struct f_uac1_opts,
-                           func_inst);
-       audio_buf_size = opts->audio_buf_size;
-
-       if (!copy_buf)
-               return -EINVAL;
-
-       /* Copy buffer is full, add it to the play_queue */
-       if (audio_buf_size - copy_buf->actual < req->actual) {
-               list_add_tail(&copy_buf->list, &audio->play_queue);
-               schedule_work(&audio->playback_work);
-               copy_buf = f_audio_buffer_alloc(audio_buf_size);
-               if (IS_ERR(copy_buf))
-                       return -ENOMEM;
-       }
-
-       memcpy(copy_buf->buf + copy_buf->actual, req->buf, req->actual);
-       copy_buf->actual += req->actual;
-       audio->copy_buf = copy_buf;
-
-       err = usb_ep_queue(ep, req, GFP_ATOMIC);
-       if (err)
-               ERROR(cdev, "%s queue req: %d\n", ep->name, err);
-
-       return 0;
-
-}
-
-static void f_audio_complete(struct usb_ep *ep, struct usb_request *req)
-{
-       struct f_audio *audio = req->context;
-       int status = req->status;
-       u32 data = 0;
-       struct usb_ep *out_ep = audio->out_ep;
-
-       switch (status) {
-
-       case 0:                         /* normal completion? */
-               if (ep == out_ep)
-                       f_audio_out_ep_complete(ep, req);
-               else if (audio->set_con) {
-                       memcpy(&data, req->buf, req->length);
-                       audio->set_con->set(audio->set_con, audio->set_cmd,
-                                       le16_to_cpu(data));
-                       audio->set_con = NULL;
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-static int audio_set_intf_req(struct usb_function *f,
-               const struct usb_ctrlrequest *ctrl)
-{
-       struct f_audio          *audio = func_to_audio(f);
-       struct usb_composite_dev *cdev = f->config->cdev;
-       struct usb_request      *req = cdev->req;
-       u8                      id = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF);
-       u16                     len = le16_to_cpu(ctrl->wLength);
-       u16                     w_value = le16_to_cpu(ctrl->wValue);
-       u8                      con_sel = (w_value >> 8) & 0xFF;
-       u8                      cmd = (ctrl->bRequest & 0x0F);
-       struct usb_audio_control_selector *cs;
-       struct usb_audio_control *con;
-
-       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, entity %d\n",
-                       ctrl->bRequest, w_value, len, id);
-
-       list_for_each_entry(cs, &audio->cs, list) {
-               if (cs->id == id) {
-                       list_for_each_entry(con, &cs->control, list) {
-                               if (con->type == con_sel) {
-                                       audio->set_con = con;
-                                       break;
-                               }
-                       }
-                       break;
-               }
-       }
-
-       audio->set_cmd = cmd;
-       req->context = audio;
-       req->complete = f_audio_complete;
-
-       return len;
-}
-
-static int audio_get_intf_req(struct usb_function *f,
-               const struct usb_ctrlrequest *ctrl)
-{
-       struct f_audio          *audio = func_to_audio(f);
-       struct usb_composite_dev *cdev = f->config->cdev;
-       struct usb_request      *req = cdev->req;
-       int                     value = -EOPNOTSUPP;
-       u8                      id = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF);
-       u16                     len = le16_to_cpu(ctrl->wLength);
-       u16                     w_value = le16_to_cpu(ctrl->wValue);
-       u8                      con_sel = (w_value >> 8) & 0xFF;
-       u8                      cmd = (ctrl->bRequest & 0x0F);
-       struct usb_audio_control_selector *cs;
-       struct usb_audio_control *con;
-
-       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, entity %d\n",
-                       ctrl->bRequest, w_value, len, id);
-
-       list_for_each_entry(cs, &audio->cs, list) {
-               if (cs->id == id) {
-                       list_for_each_entry(con, &cs->control, list) {
-                               if (con->type == con_sel && con->get) {
-                                       value = con->get(con, cmd);
-                                       break;
-                               }
-                       }
-                       break;
-               }
-       }
-
-       req->context = audio;
-       req->complete = f_audio_complete;
-       len = min_t(size_t, sizeof(value), len);
-       memcpy(req->buf, &value, len);
-
-       return len;
-}
-
-static int audio_set_endpoint_req(struct usb_function *f,
-               const struct usb_ctrlrequest *ctrl)
-{
-       struct usb_composite_dev *cdev = f->config->cdev;
-       int                     value = -EOPNOTSUPP;
-       u16                     ep = le16_to_cpu(ctrl->wIndex);
-       u16                     len = le16_to_cpu(ctrl->wLength);
-       u16                     w_value = le16_to_cpu(ctrl->wValue);
-
-       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, endpoint %d\n",
-                       ctrl->bRequest, w_value, len, ep);
-
-       switch (ctrl->bRequest) {
-       case UAC_SET_CUR:
-               value = len;
-               break;
-
-       case UAC_SET_MIN:
-               break;
-
-       case UAC_SET_MAX:
-               break;
-
-       case UAC_SET_RES:
-               break;
-
-       case UAC_SET_MEM:
-               break;
-
-       default:
-               break;
-       }
-
-       return value;
-}
-
-static int audio_get_endpoint_req(struct usb_function *f,
-               const struct usb_ctrlrequest *ctrl)
-{
-       struct usb_composite_dev *cdev = f->config->cdev;
-       int value = -EOPNOTSUPP;
-       u8 ep = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF);
-       u16 len = le16_to_cpu(ctrl->wLength);
-       u16 w_value = le16_to_cpu(ctrl->wValue);
-
-       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, endpoint %d\n",
-                       ctrl->bRequest, w_value, len, ep);
-
-       switch (ctrl->bRequest) {
-       case UAC_GET_CUR:
-       case UAC_GET_MIN:
-       case UAC_GET_MAX:
-       case UAC_GET_RES:
-               value = len;
-               break;
-       case UAC_GET_MEM:
-               break;
-       default:
-               break;
-       }
-
-       return value;
-}
-
-static int
-f_audio_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
-{
-       struct usb_composite_dev *cdev = f->config->cdev;
-       struct usb_request      *req = cdev->req;
-       int                     value = -EOPNOTSUPP;
-       u16                     w_index = le16_to_cpu(ctrl->wIndex);
-       u16                     w_value = le16_to_cpu(ctrl->wValue);
-       u16                     w_length = le16_to_cpu(ctrl->wLength);
-
-       /* composite driver infrastructure handles everything; interface
-        * activation uses set_alt().
-        */
-       switch (ctrl->bRequestType) {
-       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
-               value = audio_set_intf_req(f, ctrl);
-               break;
-
-       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
-               value = audio_get_intf_req(f, ctrl);
-               break;
-
-       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
-               value = audio_set_endpoint_req(f, ctrl);
-               break;
-
-       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
-               value = audio_get_endpoint_req(f, ctrl);
-               break;
-
-       default:
-               ERROR(cdev, "invalid control req%02x.%02x v%04x i%04x l%d\n",
-                       ctrl->bRequestType, ctrl->bRequest,
-                       w_value, w_index, w_length);
-       }
-
-       /* respond with data transfer or status phase? */
-       if (value >= 0) {
-               DBG(cdev, "audio req%02x.%02x v%04x i%04x l%d\n",
-                       ctrl->bRequestType, ctrl->bRequest,
-                       w_value, w_index, w_length);
-               req->zero = 0;
-               req->length = value;
-               value = usb_ep_queue(cdev->gadget->ep0, req, GFP_ATOMIC);
-               if (value < 0)
-                       ERROR(cdev, "audio response on err %d\n", value);
-       }
-
-       /* device either stalls (value < 0) or reports success */
-       return value;
-}
-
-static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
-{
-       struct f_audio          *audio = func_to_audio(f);
-       struct usb_composite_dev *cdev = f->config->cdev;
-       struct usb_ep *out_ep = audio->out_ep;
-       struct usb_request *req;
-       struct f_uac1_opts *opts;
-       int req_buf_size, req_count, audio_buf_size;
-       int i = 0, err = 0;
-
-       DBG(cdev, "intf %d, alt %d\n", intf, alt);
-
-       opts = container_of(f->fi, struct f_uac1_opts, func_inst);
-       req_buf_size = opts->req_buf_size;
-       req_count = opts->req_count;
-       audio_buf_size = opts->audio_buf_size;
-
-       /* No i/f has more than 2 alt settings */
-       if (alt > 1) {
-               ERROR(cdev, "%s:%d Error!\n", __func__, __LINE__);
-               return -EINVAL;
-       }
-
-       if (intf == audio->ac_intf) {
-               /* Control I/f has only 1 AltSetting - 0 */
-               if (alt) {
-                       ERROR(cdev, "%s:%d Error!\n", __func__, __LINE__);
-                       return -EINVAL;
-               }
-               return 0;
-       } else if (intf == audio->as_intf) {
-               if (alt == 1) {
-                       err = config_ep_by_speed(cdev->gadget, f, out_ep);
-                       if (err)
-                               return err;
-
-                       usb_ep_enable(out_ep);
-                       audio->copy_buf = f_audio_buffer_alloc(audio_buf_size);
-                       if (IS_ERR(audio->copy_buf))
-                               return -ENOMEM;
-
-                       /*
-                        * allocate a bunch of read buffers
-                        * and queue them all at once.
-                        */
-                       for (i = 0; i < req_count && err == 0; i++) {
-                               req = usb_ep_alloc_request(out_ep, GFP_ATOMIC);
-                               if (req) {
-                                       req->buf = kzalloc(req_buf_size,
-                                                       GFP_ATOMIC);
-                                       if (req->buf) {
-                                               req->length = req_buf_size;
-                                               req->context = audio;
-                                               req->complete =
-                                                       f_audio_complete;
-                                               err = usb_ep_queue(out_ep,
-                                                       req, GFP_ATOMIC);
-                                               if (err)
-                                                       ERROR(cdev,
-                                                       "%s queue req: %d\n",
-                                                       out_ep->name, err);
-                                       } else
-                                               err = -ENOMEM;
-                               } else
-                                       err = -ENOMEM;
-                       }
-
-               } else {
-                       struct f_audio_buf *copy_buf = audio->copy_buf;
-                       if (copy_buf) {
-                               list_add_tail(&copy_buf->list,
-                                               &audio->play_queue);
-                               schedule_work(&audio->playback_work);
-                       }
-               }
-               audio->as_alt = alt;
-       }
-
-       return err;
-}
-
-static int f_audio_get_alt(struct usb_function *f, unsigned intf)
-{
-       struct f_audio          *audio = func_to_audio(f);
-       struct usb_composite_dev *cdev = f->config->cdev;
-
-       if (intf == audio->ac_intf)
-               return audio->ac_alt;
-       else if (intf == audio->as_intf)
-               return audio->as_alt;
-       else
-               ERROR(cdev, "%s:%d Invalid Interface %d!\n",
-                     __func__, __LINE__, intf);
-
-       return -EINVAL;
-}
-
-static void f_audio_disable(struct usb_function *f)
-{
-       return;
-}
-
-/*-------------------------------------------------------------------------*/
-
-static void f_audio_build_desc(struct f_audio *audio)
-{
-       struct gaudio *card = &audio->card;
-       u8 *sam_freq;
-       int rate;
-
-       /* Set channel numbers */
-       input_terminal_desc.bNrChannels = u_audio_get_playback_channels(card);
-       as_type_i_desc.bNrChannels = u_audio_get_playback_channels(card);
-
-       /* Set sample rates */
-       rate = u_audio_get_playback_rate(card);
-       sam_freq = as_type_i_desc.tSamFreq[0];
-       memcpy(sam_freq, &rate, 3);
-
-       /* Todo: Set Sample bits and other parameters */
-
-       return;
-}
-
-/* audio function driver setup/binding */
-static int
-f_audio_bind(struct usb_configuration *c, struct usb_function *f)
-{
-       struct usb_composite_dev *cdev = c->cdev;
-       struct f_audio          *audio = func_to_audio(f);
-       struct usb_string       *us;
-       int                     status;
-       struct usb_ep           *ep = NULL;
-       struct f_uac1_opts      *audio_opts;
-
-       audio_opts = container_of(f->fi, struct f_uac1_opts, func_inst);
-       audio->card.gadget = c->cdev->gadget;
-       /* set up ASLA audio devices */
-       if (!audio_opts->bound) {
-               status = gaudio_setup(&audio->card);
-               if (status < 0)
-                       return status;
-               audio_opts->bound = true;
-       }
-       us = usb_gstrings_attach(cdev, uac1_strings, ARRAY_SIZE(strings_uac1));
-       if (IS_ERR(us))
-               return PTR_ERR(us);
-       ac_interface_desc.iInterface = us[STR_AC_IF].id;
-       input_terminal_desc.iTerminal = us[STR_INPUT_TERMINAL].id;
-       input_terminal_desc.iChannelNames = us[STR_INPUT_TERMINAL_CH_NAMES].id;
-       feature_unit_desc.iFeature = us[STR_FEAT_DESC_0].id;
-       output_terminal_desc.iTerminal = us[STR_OUTPUT_TERMINAL].id;
-       as_interface_alt_0_desc.iInterface = us[STR_AS_IF_ALT0].id;
-       as_interface_alt_1_desc.iInterface = us[STR_AS_IF_ALT1].id;
-
-
-       f_audio_build_desc(audio);
-
-       /* allocate instance-specific interface IDs, and patch descriptors */
-       status = usb_interface_id(c, f);
-       if (status < 0)
-               goto fail;
-       ac_interface_desc.bInterfaceNumber = status;
-       audio->ac_intf = status;
-       audio->ac_alt = 0;
-
-       status = usb_interface_id(c, f);
-       if (status < 0)
-               goto fail;
-       as_interface_alt_0_desc.bInterfaceNumber = status;
-       as_interface_alt_1_desc.bInterfaceNumber = status;
-       audio->as_intf = status;
-       audio->as_alt = 0;
-
-       status = -ENODEV;
-
-       /* allocate instance-specific endpoints */
-       ep = usb_ep_autoconfig(cdev->gadget, &as_out_ep_desc);
-       if (!ep)
-               goto fail;
-       audio->out_ep = ep;
-       audio->out_ep->desc = &as_out_ep_desc;
-
-       status = -ENOMEM;
-
-       /* copy descriptors, and track endpoint copies */
-       status = usb_assign_descriptors(f, f_audio_desc, f_audio_desc, NULL,
-                                       NULL);
-       if (status)
-               goto fail;
-       return 0;
-
-fail:
-       gaudio_cleanup(&audio->card);
-       return status;
-}
-
-/*-------------------------------------------------------------------------*/
-
-static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
-{
-       con->data[cmd] = value;
-
-       return 0;
-}
-
-static int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
-{
-       return con->data[cmd];
-}
-
-/* Todo: add more control selecotor dynamically */
-static int control_selector_init(struct f_audio *audio)
-{
-       INIT_LIST_HEAD(&audio->cs);
-       list_add(&feature_unit.list, &audio->cs);
-
-       INIT_LIST_HEAD(&feature_unit.control);
-       list_add(&mute_control.list, &feature_unit.control);
-       list_add(&volume_control.list, &feature_unit.control);
-
-       volume_control.data[UAC__CUR] = 0xffc0;
-       volume_control.data[UAC__MIN] = 0xe3a0;
-       volume_control.data[UAC__MAX] = 0xfff0;
-       volume_control.data[UAC__RES] = 0x0030;
-
-       return 0;
-}
-
-static inline struct f_uac1_opts *to_f_uac1_opts(struct config_item *item)
-{
-       return container_of(to_config_group(item), struct f_uac1_opts,
-                           func_inst.group);
-}
-
-static void f_uac1_attr_release(struct config_item *item)
-{
-       struct f_uac1_opts *opts = to_f_uac1_opts(item);
-
-       usb_put_function_instance(&opts->func_inst);
-}
-
-static struct configfs_item_operations f_uac1_item_ops = {
-       .release        = f_uac1_attr_release,
-};
-
-#define UAC1_INT_ATTRIBUTE(name)                                       \
-static ssize_t f_uac1_opts_##name##_show(struct config_item *item,     \
-                                        char *page)                    \
-{                                                                      \
-       struct f_uac1_opts *opts = to_f_uac1_opts(item);                \
-       int result;                                                     \
-                                                                       \
-       mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%u\n", opts->name);                     \
-       mutex_unlock(&opts->lock);                                      \
-                                                                       \
-       return result;                                                  \
-}                                                                      \
-                                                                       \
-static ssize_t f_uac1_opts_##name##_store(struct config_item *item,            \
-                                         const char *page, size_t len) \
-{                                                                      \
-       struct f_uac1_opts *opts = to_f_uac1_opts(item);                \
-       int ret;                                                        \
-       u32 num;                                                        \
-                                                                       \
-       mutex_lock(&opts->lock);                                        \
-       if (opts->refcnt) {                                             \
-               ret = -EBUSY;                                           \
-               goto end;                                               \
-       }                                                               \
-                                                                       \
-       ret = kstrtou32(page, 0, &num);                                 \
-       if (ret)                                                        \
-               goto end;                                               \
-                                                                       \
-       opts->name = num;                                               \
-       ret = len;                                                      \
-                                                                       \
-end:                                                                   \
-       mutex_unlock(&opts->lock);                                      \
-       return ret;                                                     \
-}                                                                      \
-                                                                       \
-CONFIGFS_ATTR(f_uac1_opts_, name)
-
-UAC1_INT_ATTRIBUTE(req_buf_size);
-UAC1_INT_ATTRIBUTE(req_count);
-UAC1_INT_ATTRIBUTE(audio_buf_size);
-
-#define UAC1_STR_ATTRIBUTE(name)                                       \
-static ssize_t f_uac1_opts_##name##_show(struct config_item *item,     \
-                                        char *page)                    \
-{                                                                      \
-       struct f_uac1_opts *opts = to_f_uac1_opts(item);                \
-       int result;                                                     \
-                                                                       \
-       mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%s\n", opts->name);                     \
-       mutex_unlock(&opts->lock);                                      \
-                                                                       \
-       return result;                                                  \
-}                                                                      \
-                                                                       \
-static ssize_t f_uac1_opts_##name##_store(struct config_item *item,    \
-                                         const char *page, size_t len) \
-{                                                                      \
-       struct f_uac1_opts *opts = to_f_uac1_opts(item);                \
-       int ret = -EBUSY;                                               \
-       char *tmp;                                                      \
-                                                                       \
-       mutex_lock(&opts->lock);                                        \
-       if (opts->refcnt)                                               \
-               goto end;                                               \
-                                                                       \
-       tmp = kstrndup(page, len, GFP_KERNEL);                          \
-       if (tmp) {                                                      \
-               ret = -ENOMEM;                                          \
-               goto end;                                               \
-       }                                                               \
-       if (opts->name##_alloc)                                         \
-               kfree(opts->name);                                      \
-       opts->name##_alloc = true;                                      \
-       opts->name = tmp;                                               \
-       ret = len;                                                      \
-                                                                       \
-end:                                                                   \
-       mutex_unlock(&opts->lock);                                      \
-       return ret;                                                     \
-}                                                                      \
-                                                                       \
-CONFIGFS_ATTR(f_uac1_opts_, name)
-
-UAC1_STR_ATTRIBUTE(fn_play);
-UAC1_STR_ATTRIBUTE(fn_cap);
-UAC1_STR_ATTRIBUTE(fn_cntl);
-
-static struct configfs_attribute *f_uac1_attrs[] = {
-       &f_uac1_opts_attr_req_buf_size,
-       &f_uac1_opts_attr_req_count,
-       &f_uac1_opts_attr_audio_buf_size,
-       &f_uac1_opts_attr_fn_play,
-       &f_uac1_opts_attr_fn_cap,
-       &f_uac1_opts_attr_fn_cntl,
-       NULL,
-};
-
-static struct config_item_type f_uac1_func_type = {
-       .ct_item_ops    = &f_uac1_item_ops,
-       .ct_attrs       = f_uac1_attrs,
-       .ct_owner       = THIS_MODULE,
-};
-
-static void f_audio_free_inst(struct usb_function_instance *f)
-{
-       struct f_uac1_opts *opts;
-
-       opts = container_of(f, struct f_uac1_opts, func_inst);
-       if (opts->fn_play_alloc)
-               kfree(opts->fn_play);
-       if (opts->fn_cap_alloc)
-               kfree(opts->fn_cap);
-       if (opts->fn_cntl_alloc)
-               kfree(opts->fn_cntl);
-       kfree(opts);
-}
-
-static struct usb_function_instance *f_audio_alloc_inst(void)
-{
-       struct f_uac1_opts *opts;
-
-       opts = kzalloc(sizeof(*opts), GFP_KERNEL);
-       if (!opts)
-               return ERR_PTR(-ENOMEM);
-
-       mutex_init(&opts->lock);
-       opts->func_inst.free_func_inst = f_audio_free_inst;
-
-       config_group_init_type_name(&opts->func_inst.group, "",
-                                   &f_uac1_func_type);
-
-       opts->req_buf_size = UAC1_OUT_EP_MAX_PACKET_SIZE;
-       opts->req_count = UAC1_REQ_COUNT;
-       opts->audio_buf_size = UAC1_AUDIO_BUF_SIZE;
-       opts->fn_play = FILE_PCM_PLAYBACK;
-       opts->fn_cap = FILE_PCM_CAPTURE;
-       opts->fn_cntl = FILE_CONTROL;
-       return &opts->func_inst;
-}
-
-static void f_audio_free(struct usb_function *f)
-{
-       struct f_audio *audio = func_to_audio(f);
-       struct f_uac1_opts *opts;
-
-       gaudio_cleanup(&audio->card);
-       opts = container_of(f->fi, struct f_uac1_opts, func_inst);
-       kfree(audio);
-       mutex_lock(&opts->lock);
-       --opts->refcnt;
-       mutex_unlock(&opts->lock);
-}
-
-static void f_audio_unbind(struct usb_configuration *c, struct usb_function *f)
-{
-       usb_free_all_descriptors(f);
-}
-
-static struct usb_function *f_audio_alloc(struct usb_function_instance *fi)
-{
-       struct f_audio *audio;
-       struct f_uac1_opts *opts;
-
-       /* allocate and initialize one new instance */
-       audio = kzalloc(sizeof(*audio), GFP_KERNEL);
-       if (!audio)
-               return ERR_PTR(-ENOMEM);
-
-       audio->card.func.name = "g_audio";
-
-       opts = container_of(fi, struct f_uac1_opts, func_inst);
-       mutex_lock(&opts->lock);
-       ++opts->refcnt;
-       mutex_unlock(&opts->lock);
-       INIT_LIST_HEAD(&audio->play_queue);
-       spin_lock_init(&audio->lock);
-
-       audio->card.func.bind = f_audio_bind;
-       audio->card.func.unbind = f_audio_unbind;
-       audio->card.func.set_alt = f_audio_set_alt;
-       audio->card.func.get_alt = f_audio_get_alt;
-       audio->card.func.setup = f_audio_setup;
-       audio->card.func.disable = f_audio_disable;
-       audio->card.func.free_func = f_audio_free;
-
-       control_selector_init(audio);
-
-       INIT_WORK(&audio->playback_work, f_audio_playback_work);
-
-       return &audio->card.func;
-}
-
-DECLARE_USB_FUNCTION_INIT(uac1, f_audio_alloc_inst, f_audio_alloc);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Bryan Wu");
diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
new file mode 100644 (file)
index 0000000..5d229e7
--- /dev/null
@@ -0,0 +1,1021 @@
+/*
+ * f_audio.c -- USB Audio class function driver
+  *
+ * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
+ * Copyright (C) 2008 Analog Devices, Inc
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/atomic.h>
+
+#include "u_uac1_legacy.h"
+
+static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value);
+static int generic_get_cmd(struct usb_audio_control *con, u8 cmd);
+
+/*
+ * DESCRIPTORS ... most are static, but strings and full
+ * configuration descriptors are built on demand.
+ */
+
+/*
+ * We have two interfaces- AudioControl and AudioStreaming
+ * TODO: only supcard playback currently
+ */
+#define F_AUDIO_AC_INTERFACE   0
+#define F_AUDIO_AS_INTERFACE   1
+#define F_AUDIO_NUM_INTERFACES 1
+
+/* B.3.1  Standard AC Interface Descriptor */
+static struct usb_interface_descriptor ac_interface_desc = {
+       .bLength =              USB_DT_INTERFACE_SIZE,
+       .bDescriptorType =      USB_DT_INTERFACE,
+       .bNumEndpoints =        0,
+       .bInterfaceClass =      USB_CLASS_AUDIO,
+       .bInterfaceSubClass =   USB_SUBCLASS_AUDIOCONTROL,
+};
+
+/*
+ * The number of AudioStreaming and MIDIStreaming interfaces
+ * in the Audio Interface Collection
+ */
+DECLARE_UAC_AC_HEADER_DESCRIPTOR(1);
+
+#define UAC_DT_AC_HEADER_LENGTH        UAC_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
+/* 1 input terminal, 1 output terminal and 1 feature unit */
+#define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \
+       + UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))
+/* B.3.2  Class-Specific AC Interface Descriptor */
+static struct uac1_ac_header_descriptor_1 ac_header_desc = {
+       .bLength =              UAC_DT_AC_HEADER_LENGTH,
+       .bDescriptorType =      USB_DT_CS_INTERFACE,
+       .bDescriptorSubtype =   UAC_HEADER,
+       .bcdADC =               __constant_cpu_to_le16(0x0100),
+       .wTotalLength =         __constant_cpu_to_le16(UAC_DT_TOTAL_LENGTH),
+       .bInCollection =        F_AUDIO_NUM_INTERFACES,
+       .baInterfaceNr = {
+       /* Interface number of the first AudioStream interface */
+               [0] =           1,
+       }
+};
+
+#define INPUT_TERMINAL_ID      1
+static struct uac_input_terminal_descriptor input_terminal_desc = {
+       .bLength =              UAC_DT_INPUT_TERMINAL_SIZE,
+       .bDescriptorType =      USB_DT_CS_INTERFACE,
+       .bDescriptorSubtype =   UAC_INPUT_TERMINAL,
+       .bTerminalID =          INPUT_TERMINAL_ID,
+       .wTerminalType =        UAC_TERMINAL_STREAMING,
+       .bAssocTerminal =       0,
+       .wChannelConfig =       0x3,
+};
+
+DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(0);
+
+#define FEATURE_UNIT_ID                2
+static struct uac_feature_unit_descriptor_0 feature_unit_desc = {
+       .bLength                = UAC_DT_FEATURE_UNIT_SIZE(0),
+       .bDescriptorType        = USB_DT_CS_INTERFACE,
+       .bDescriptorSubtype     = UAC_FEATURE_UNIT,
+       .bUnitID                = FEATURE_UNIT_ID,
+       .bSourceID              = INPUT_TERMINAL_ID,
+       .bControlSize           = 2,
+       .bmaControls[0]         = (UAC_FU_MUTE | UAC_FU_VOLUME),
+};
+
+static struct usb_audio_control mute_control = {
+       .list = LIST_HEAD_INIT(mute_control.list),
+       .name = "Mute Control",
+       .type = UAC_FU_MUTE,
+       /* Todo: add real Mute control code */
+       .set = generic_set_cmd,
+       .get = generic_get_cmd,
+};
+
+static struct usb_audio_control volume_control = {
+       .list = LIST_HEAD_INIT(volume_control.list),
+       .name = "Volume Control",
+       .type = UAC_FU_VOLUME,
+       /* Todo: add real Volume control code */
+       .set = generic_set_cmd,
+       .get = generic_get_cmd,
+};
+
+static struct usb_audio_control_selector feature_unit = {
+       .list = LIST_HEAD_INIT(feature_unit.list),
+       .id = FEATURE_UNIT_ID,
+       .name = "Mute & Volume Control",
+       .type = UAC_FEATURE_UNIT,
+       .desc = (struct usb_descriptor_header *)&feature_unit_desc,
+};
+
+#define OUTPUT_TERMINAL_ID     3
+static struct uac1_output_terminal_descriptor output_terminal_desc = {
+       .bLength                = UAC_DT_OUTPUT_TERMINAL_SIZE,
+       .bDescriptorType        = USB_DT_CS_INTERFACE,
+       .bDescriptorSubtype     = UAC_OUTPUT_TERMINAL,
+       .bTerminalID            = OUTPUT_TERMINAL_ID,
+       .wTerminalType          = UAC_OUTPUT_TERMINAL_SPEAKER,
+       .bAssocTerminal         = FEATURE_UNIT_ID,
+       .bSourceID              = FEATURE_UNIT_ID,
+};
+
+/* B.4.1  Standard AS Interface Descriptor */
+static struct usb_interface_descriptor as_interface_alt_0_desc = {
+       .bLength =              USB_DT_INTERFACE_SIZE,
+       .bDescriptorType =      USB_DT_INTERFACE,
+       .bAlternateSetting =    0,
+       .bNumEndpoints =        0,
+       .bInterfaceClass =      USB_CLASS_AUDIO,
+       .bInterfaceSubClass =   USB_SUBCLASS_AUDIOSTREAMING,
+};
+
+static struct usb_interface_descriptor as_interface_alt_1_desc = {
+       .bLength =              USB_DT_INTERFACE_SIZE,
+       .bDescriptorType =      USB_DT_INTERFACE,
+       .bAlternateSetting =    1,
+       .bNumEndpoints =        1,
+       .bInterfaceClass =      USB_CLASS_AUDIO,
+       .bInterfaceSubClass =   USB_SUBCLASS_AUDIOSTREAMING,
+};
+
+/* B.4.2  Class-Specific AS Interface Descriptor */
+static struct uac1_as_header_descriptor as_header_desc = {
+       .bLength =              UAC_DT_AS_HEADER_SIZE,
+       .bDescriptorType =      USB_DT_CS_INTERFACE,
+       .bDescriptorSubtype =   UAC_AS_GENERAL,
+       .bTerminalLink =        INPUT_TERMINAL_ID,
+       .bDelay =               1,
+       .wFormatTag =           UAC_FORMAT_TYPE_I_PCM,
+};
+
+DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(1);
+
+static struct uac_format_type_i_discrete_descriptor_1 as_type_i_desc = {
+       .bLength =              UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1),
+       .bDescriptorType =      USB_DT_CS_INTERFACE,
+       .bDescriptorSubtype =   UAC_FORMAT_TYPE,
+       .bFormatType =          UAC_FORMAT_TYPE_I,
+       .bSubframeSize =        2,
+       .bBitResolution =       16,
+       .bSamFreqType =         1,
+};
+
+/* Standard ISO OUT Endpoint Descriptor */
+static struct usb_endpoint_descriptor as_out_ep_desc  = {
+       .bLength =              USB_DT_ENDPOINT_AUDIO_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+       .bEndpointAddress =     USB_DIR_OUT,
+       .bmAttributes =         USB_ENDPOINT_SYNC_ADAPTIVE
+                               | USB_ENDPOINT_XFER_ISOC,
+       .wMaxPacketSize =       cpu_to_le16(UAC1_OUT_EP_MAX_PACKET_SIZE),
+       .bInterval =            4,
+};
+
+/* Class-specific AS ISO OUT Endpoint Descriptor */
+static struct uac_iso_endpoint_descriptor as_iso_out_desc = {
+       .bLength =              UAC_ISO_ENDPOINT_DESC_SIZE,
+       .bDescriptorType =      USB_DT_CS_ENDPOINT,
+       .bDescriptorSubtype =   UAC_EP_GENERAL,
+       .bmAttributes =         1,
+       .bLockDelayUnits =      1,
+       .wLockDelay =           __constant_cpu_to_le16(1),
+};
+
+static struct usb_descriptor_header *f_audio_desc[] = {
+       (struct usb_descriptor_header *)&ac_interface_desc,
+       (struct usb_descriptor_header *)&ac_header_desc,
+
+       (struct usb_descriptor_header *)&input_terminal_desc,
+       (struct usb_descriptor_header *)&output_terminal_desc,
+       (struct usb_descriptor_header *)&feature_unit_desc,
+
+       (struct usb_descriptor_header *)&as_interface_alt_0_desc,
+       (struct usb_descriptor_header *)&as_interface_alt_1_desc,
+       (struct usb_descriptor_header *)&as_header_desc,
+
+       (struct usb_descriptor_header *)&as_type_i_desc,
+
+       (struct usb_descriptor_header *)&as_out_ep_desc,
+       (struct usb_descriptor_header *)&as_iso_out_desc,
+       NULL,
+};
+
+enum {
+       STR_AC_IF,
+       STR_INPUT_TERMINAL,
+       STR_INPUT_TERMINAL_CH_NAMES,
+       STR_FEAT_DESC_0,
+       STR_OUTPUT_TERMINAL,
+       STR_AS_IF_ALT0,
+       STR_AS_IF_ALT1,
+};
+
+static struct usb_string strings_uac1[] = {
+       [STR_AC_IF].s = "AC Interface",
+       [STR_INPUT_TERMINAL].s = "Input terminal",
+       [STR_INPUT_TERMINAL_CH_NAMES].s = "Channels",
+       [STR_FEAT_DESC_0].s = "Volume control & mute",
+       [STR_OUTPUT_TERMINAL].s = "Output terminal",
+       [STR_AS_IF_ALT0].s = "AS Interface",
+       [STR_AS_IF_ALT1].s = "AS Interface",
+       { },
+};
+
+static struct usb_gadget_strings str_uac1 = {
+       .language = 0x0409,     /* en-us */
+       .strings = strings_uac1,
+};
+
+static struct usb_gadget_strings *uac1_strings[] = {
+       &str_uac1,
+       NULL,
+};
+
+/*
+ * This function is an ALSA sound card following USB Audio Class Spec 1.0.
+ */
+
+/*-------------------------------------------------------------------------*/
+struct f_audio_buf {
+       u8 *buf;
+       int actual;
+       struct list_head list;
+};
+
+static struct f_audio_buf *f_audio_buffer_alloc(int buf_size)
+{
+       struct f_audio_buf *copy_buf;
+
+       copy_buf = kzalloc(sizeof *copy_buf, GFP_ATOMIC);
+       if (!copy_buf)
+               return ERR_PTR(-ENOMEM);
+
+       copy_buf->buf = kzalloc(buf_size, GFP_ATOMIC);
+       if (!copy_buf->buf) {
+               kfree(copy_buf);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       return copy_buf;
+}
+
+static void f_audio_buffer_free(struct f_audio_buf *audio_buf)
+{
+       kfree(audio_buf->buf);
+       kfree(audio_buf);
+}
+/*-------------------------------------------------------------------------*/
+
+struct f_audio {
+       struct gaudio                   card;
+
+       u8 ac_intf, ac_alt;
+       u8 as_intf, as_alt;
+
+       /* endpoints handle full and/or high speeds */
+       struct usb_ep                   *out_ep;
+
+       spinlock_t                      lock;
+       struct f_audio_buf *copy_buf;
+       struct work_struct playback_work;
+       struct list_head play_queue;
+
+       /* Control Set command */
+       struct list_head cs;
+       u8 set_cmd;
+       struct usb_audio_control *set_con;
+};
+
+static inline struct f_audio *func_to_audio(struct usb_function *f)
+{
+       return container_of(f, struct f_audio, card.func);
+}
+
+/*-------------------------------------------------------------------------*/
+
+static void f_audio_playback_work(struct work_struct *data)
+{
+       struct f_audio *audio = container_of(data, struct f_audio,
+                                       playback_work);
+       struct f_audio_buf *play_buf;
+
+       spin_lock_irq(&audio->lock);
+       if (list_empty(&audio->play_queue)) {
+               spin_unlock_irq(&audio->lock);
+               return;
+       }
+       play_buf = list_first_entry(&audio->play_queue,
+                       struct f_audio_buf, list);
+       list_del(&play_buf->list);
+       spin_unlock_irq(&audio->lock);
+
+       u_audio_playback(&audio->card, play_buf->buf, play_buf->actual);
+       f_audio_buffer_free(play_buf);
+}
+
+static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)
+{
+       struct f_audio *audio = req->context;
+       struct usb_composite_dev *cdev = audio->card.func.config->cdev;
+       struct f_audio_buf *copy_buf = audio->copy_buf;
+       struct f_uac1_legacy_opts *opts;
+       int audio_buf_size;
+       int err;
+
+       opts = container_of(audio->card.func.fi, struct f_uac1_legacy_opts,
+                           func_inst);
+       audio_buf_size = opts->audio_buf_size;
+
+       if (!copy_buf)
+               return -EINVAL;
+
+       /* Copy buffer is full, add it to the play_queue */
+       if (audio_buf_size - copy_buf->actual < req->actual) {
+               list_add_tail(&copy_buf->list, &audio->play_queue);
+               schedule_work(&audio->playback_work);
+               copy_buf = f_audio_buffer_alloc(audio_buf_size);
+               if (IS_ERR(copy_buf))
+                       return -ENOMEM;
+       }
+
+       memcpy(copy_buf->buf + copy_buf->actual, req->buf, req->actual);
+       copy_buf->actual += req->actual;
+       audio->copy_buf = copy_buf;
+
+       err = usb_ep_queue(ep, req, GFP_ATOMIC);
+       if (err)
+               ERROR(cdev, "%s queue req: %d\n", ep->name, err);
+
+       return 0;
+
+}
+
+static void f_audio_complete(struct usb_ep *ep, struct usb_request *req)
+{
+       struct f_audio *audio = req->context;
+       int status = req->status;
+       u32 data = 0;
+       struct usb_ep *out_ep = audio->out_ep;
+
+       switch (status) {
+
+       case 0:                         /* normal completion? */
+               if (ep == out_ep)
+                       f_audio_out_ep_complete(ep, req);
+               else if (audio->set_con) {
+                       memcpy(&data, req->buf, req->length);
+                       audio->set_con->set(audio->set_con, audio->set_cmd,
+                                       le16_to_cpu(data));
+                       audio->set_con = NULL;
+               }
+               break;
+       default:
+               break;
+       }
+}
+
+static int audio_set_intf_req(struct usb_function *f,
+               const struct usb_ctrlrequest *ctrl)
+{
+       struct f_audio          *audio = func_to_audio(f);
+       struct usb_composite_dev *cdev = f->config->cdev;
+       struct usb_request      *req = cdev->req;
+       u8                      id = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF);
+       u16                     len = le16_to_cpu(ctrl->wLength);
+       u16                     w_value = le16_to_cpu(ctrl->wValue);
+       u8                      con_sel = (w_value >> 8) & 0xFF;
+       u8                      cmd = (ctrl->bRequest & 0x0F);
+       struct usb_audio_control_selector *cs;
+       struct usb_audio_control *con;
+
+       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, entity %d\n",
+                       ctrl->bRequest, w_value, len, id);
+
+       list_for_each_entry(cs, &audio->cs, list) {
+               if (cs->id == id) {
+                       list_for_each_entry(con, &cs->control, list) {
+                               if (con->type == con_sel) {
+                                       audio->set_con = con;
+                                       break;
+                               }
+                       }
+                       break;
+               }
+       }
+
+       audio->set_cmd = cmd;
+       req->context = audio;
+       req->complete = f_audio_complete;
+
+       return len;
+}
+
+static int audio_get_intf_req(struct usb_function *f,
+               const struct usb_ctrlrequest *ctrl)
+{
+       struct f_audio          *audio = func_to_audio(f);
+       struct usb_composite_dev *cdev = f->config->cdev;
+       struct usb_request      *req = cdev->req;
+       int                     value = -EOPNOTSUPP;
+       u8                      id = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF);
+       u16                     len = le16_to_cpu(ctrl->wLength);
+       u16                     w_value = le16_to_cpu(ctrl->wValue);
+       u8                      con_sel = (w_value >> 8) & 0xFF;
+       u8                      cmd = (ctrl->bRequest & 0x0F);
+       struct usb_audio_control_selector *cs;
+       struct usb_audio_control *con;
+
+       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, entity %d\n",
+                       ctrl->bRequest, w_value, len, id);
+
+       list_for_each_entry(cs, &audio->cs, list) {
+               if (cs->id == id) {
+                       list_for_each_entry(con, &cs->control, list) {
+                               if (con->type == con_sel && con->get) {
+                                       value = con->get(con, cmd);
+                                       break;
+                               }
+                       }
+                       break;
+               }
+       }
+
+       req->context = audio;
+       req->complete = f_audio_complete;
+       len = min_t(size_t, sizeof(value), len);
+       memcpy(req->buf, &value, len);
+
+       return len;
+}
+
+static int audio_set_endpoint_req(struct usb_function *f,
+               const struct usb_ctrlrequest *ctrl)
+{
+       struct usb_composite_dev *cdev = f->config->cdev;
+       int                     value = -EOPNOTSUPP;
+       u16                     ep = le16_to_cpu(ctrl->wIndex);
+       u16                     len = le16_to_cpu(ctrl->wLength);
+       u16                     w_value = le16_to_cpu(ctrl->wValue);
+
+       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, endpoint %d\n",
+                       ctrl->bRequest, w_value, len, ep);
+
+       switch (ctrl->bRequest) {
+       case UAC_SET_CUR:
+               value = len;
+               break;
+
+       case UAC_SET_MIN:
+               break;
+
+       case UAC_SET_MAX:
+               break;
+
+       case UAC_SET_RES:
+               break;
+
+       case UAC_SET_MEM:
+               break;
+
+       default:
+               break;
+       }
+
+       return value;
+}
+
+static int audio_get_endpoint_req(struct usb_function *f,
+               const struct usb_ctrlrequest *ctrl)
+{
+       struct usb_composite_dev *cdev = f->config->cdev;
+       int value = -EOPNOTSUPP;
+       u8 ep = ((le16_to_cpu(ctrl->wIndex) >> 8) & 0xFF);
+       u16 len = le16_to_cpu(ctrl->wLength);
+       u16 w_value = le16_to_cpu(ctrl->wValue);
+
+       DBG(cdev, "bRequest 0x%x, w_value 0x%04x, len %d, endpoint %d\n",
+                       ctrl->bRequest, w_value, len, ep);
+
+       switch (ctrl->bRequest) {
+       case UAC_GET_CUR:
+       case UAC_GET_MIN:
+       case UAC_GET_MAX:
+       case UAC_GET_RES:
+               value = len;
+               break;
+       case UAC_GET_MEM:
+               break;
+       default:
+               break;
+       }
+
+       return value;
+}
+
+static int
+f_audio_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
+{
+       struct usb_composite_dev *cdev = f->config->cdev;
+       struct usb_request      *req = cdev->req;
+       int                     value = -EOPNOTSUPP;
+       u16                     w_index = le16_to_cpu(ctrl->wIndex);
+       u16                     w_value = le16_to_cpu(ctrl->wValue);
+       u16                     w_length = le16_to_cpu(ctrl->wLength);
+
+       /* composite driver infrastructure handles everything; interface
+        * activation uses set_alt().
+        */
+       switch (ctrl->bRequestType) {
+       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
+               value = audio_set_intf_req(f, ctrl);
+               break;
+
+       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
+               value = audio_get_intf_req(f, ctrl);
+               break;
+
+       case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
+               value = audio_set_endpoint_req(f, ctrl);
+               break;
+
+       case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
+               value = audio_get_endpoint_req(f, ctrl);
+               break;
+
+       default:
+               ERROR(cdev, "invalid control req%02x.%02x v%04x i%04x l%d\n",
+                       ctrl->bRequestType, ctrl->bRequest,
+                       w_value, w_index, w_length);
+       }
+
+       /* respond with data transfer or status phase? */
+       if (value >= 0) {
+               DBG(cdev, "audio req%02x.%02x v%04x i%04x l%d\n",
+                       ctrl->bRequestType, ctrl->bRequest,
+                       w_value, w_index, w_length);
+               req->zero = 0;
+               req->length = value;
+               value = usb_ep_queue(cdev->gadget->ep0, req, GFP_ATOMIC);
+               if (value < 0)
+                       ERROR(cdev, "audio response on err %d\n", value);
+       }
+
+       /* device either stalls (value < 0) or reports success */
+       return value;
+}
+
+static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
+{
+       struct f_audio          *audio = func_to_audio(f);
+       struct usb_composite_dev *cdev = f->config->cdev;
+       struct usb_ep *out_ep = audio->out_ep;
+       struct usb_request *req;
+       struct f_uac1_legacy_opts *opts;
+       int req_buf_size, req_count, audio_buf_size;
+       int i = 0, err = 0;
+
+       DBG(cdev, "intf %d, alt %d\n", intf, alt);
+
+       opts = container_of(f->fi, struct f_uac1_legacy_opts, func_inst);
+       req_buf_size = opts->req_buf_size;
+       req_count = opts->req_count;
+       audio_buf_size = opts->audio_buf_size;
+
+       /* No i/f has more than 2 alt settings */
+       if (alt > 1) {
+               ERROR(cdev, "%s:%d Error!\n", __func__, __LINE__);
+               return -EINVAL;
+       }
+
+       if (intf == audio->ac_intf) {
+               /* Control I/f has only 1 AltSetting - 0 */
+               if (alt) {
+                       ERROR(cdev, "%s:%d Error!\n", __func__, __LINE__);
+                       return -EINVAL;
+               }
+               return 0;
+       } else if (intf == audio->as_intf) {
+               if (alt == 1) {
+                       err = config_ep_by_speed(cdev->gadget, f, out_ep);
+                       if (err)
+                               return err;
+
+                       usb_ep_enable(out_ep);
+                       audio->copy_buf = f_audio_buffer_alloc(audio_buf_size);
+                       if (IS_ERR(audio->copy_buf))
+                               return -ENOMEM;
+
+                       /*
+                        * allocate a bunch of read buffers
+                        * and queue them all at once.
+                        */
+                       for (i = 0; i < req_count && err == 0; i++) {
+                               req = usb_ep_alloc_request(out_ep, GFP_ATOMIC);
+                               if (req) {
+                                       req->buf = kzalloc(req_buf_size,
+                                                       GFP_ATOMIC);
+                                       if (req->buf) {
+                                               req->length = req_buf_size;
+                                               req->context = audio;
+                                               req->complete =
+                                                       f_audio_complete;
+                                               err = usb_ep_queue(out_ep,
+                                                       req, GFP_ATOMIC);
+                                               if (err)
+                                                       ERROR(cdev,
+                                                       "%s queue req: %d\n",
+                                                       out_ep->name, err);
+                                       } else
+                                               err = -ENOMEM;
+                               } else
+                                       err = -ENOMEM;
+                       }
+
+               } else {
+                       struct f_audio_buf *copy_buf = audio->copy_buf;
+                       if (copy_buf) {
+                               list_add_tail(&copy_buf->list,
+                                               &audio->play_queue);
+                               schedule_work(&audio->playback_work);
+                       }
+               }
+               audio->as_alt = alt;
+       }
+
+       return err;
+}
+
+static int f_audio_get_alt(struct usb_function *f, unsigned intf)
+{
+       struct f_audio          *audio = func_to_audio(f);
+       struct usb_composite_dev *cdev = f->config->cdev;
+
+       if (intf == audio->ac_intf)
+               return audio->ac_alt;
+       else if (intf == audio->as_intf)
+               return audio->as_alt;
+       else
+               ERROR(cdev, "%s:%d Invalid Interface %d!\n",
+                     __func__, __LINE__, intf);
+
+       return -EINVAL;
+}
+
+static void f_audio_disable(struct usb_function *f)
+{
+       return;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static void f_audio_build_desc(struct f_audio *audio)
+{
+       struct gaudio *card = &audio->card;
+       u8 *sam_freq;
+       int rate;
+
+       /* Set channel numbers */
+       input_terminal_desc.bNrChannels = u_audio_get_playback_channels(card);
+       as_type_i_desc.bNrChannels = u_audio_get_playback_channels(card);
+
+       /* Set sample rates */
+       rate = u_audio_get_playback_rate(card);
+       sam_freq = as_type_i_desc.tSamFreq[0];
+       memcpy(sam_freq, &rate, 3);
+
+       /* Todo: Set Sample bits and other parameters */
+
+       return;
+}
+
+/* audio function driver setup/binding */
+static int
+f_audio_bind(struct usb_configuration *c, struct usb_function *f)
+{
+       struct usb_composite_dev *cdev = c->cdev;
+       struct f_audio          *audio = func_to_audio(f);
+       struct usb_string       *us;
+       int                     status;
+       struct usb_ep           *ep = NULL;
+       struct f_uac1_legacy_opts       *audio_opts;
+
+       audio_opts = container_of(f->fi, struct f_uac1_legacy_opts, func_inst);
+       audio->card.gadget = c->cdev->gadget;
+       /* set up ASLA audio devices */
+       if (!audio_opts->bound) {
+               status = gaudio_setup(&audio->card);
+               if (status < 0)
+                       return status;
+               audio_opts->bound = true;
+       }
+       us = usb_gstrings_attach(cdev, uac1_strings, ARRAY_SIZE(strings_uac1));
+       if (IS_ERR(us))
+               return PTR_ERR(us);
+       ac_interface_desc.iInterface = us[STR_AC_IF].id;
+       input_terminal_desc.iTerminal = us[STR_INPUT_TERMINAL].id;
+       input_terminal_desc.iChannelNames = us[STR_INPUT_TERMINAL_CH_NAMES].id;
+       feature_unit_desc.iFeature = us[STR_FEAT_DESC_0].id;
+       output_terminal_desc.iTerminal = us[STR_OUTPUT_TERMINAL].id;
+       as_interface_alt_0_desc.iInterface = us[STR_AS_IF_ALT0].id;
+       as_interface_alt_1_desc.iInterface = us[STR_AS_IF_ALT1].id;
+
+
+       f_audio_build_desc(audio);
+
+       /* allocate instance-specific interface IDs, and patch descriptors */
+       status = usb_interface_id(c, f);
+       if (status < 0)
+               goto fail;
+       ac_interface_desc.bInterfaceNumber = status;
+       audio->ac_intf = status;
+       audio->ac_alt = 0;
+
+       status = usb_interface_id(c, f);
+       if (status < 0)
+               goto fail;
+       as_interface_alt_0_desc.bInterfaceNumber = status;
+       as_interface_alt_1_desc.bInterfaceNumber = status;
+       audio->as_intf = status;
+       audio->as_alt = 0;
+
+       status = -ENODEV;
+
+       /* allocate instance-specific endpoints */
+       ep = usb_ep_autoconfig(cdev->gadget, &as_out_ep_desc);
+       if (!ep)
+               goto fail;
+       audio->out_ep = ep;
+       audio->out_ep->desc = &as_out_ep_desc;
+
+       status = -ENOMEM;
+
+       /* copy descriptors, and track endpoint copies */
+       status = usb_assign_descriptors(f, f_audio_desc, f_audio_desc, NULL,
+                                       NULL);
+       if (status)
+               goto fail;
+       return 0;
+
+fail:
+       gaudio_cleanup(&audio->card);
+       return status;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
+{
+       con->data[cmd] = value;
+
+       return 0;
+}
+
+static int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
+{
+       return con->data[cmd];
+}
+
+/* Todo: add more control selecotor dynamically */
+static int control_selector_init(struct f_audio *audio)
+{
+       INIT_LIST_HEAD(&audio->cs);
+       list_add(&feature_unit.list, &audio->cs);
+
+       INIT_LIST_HEAD(&feature_unit.control);
+       list_add(&mute_control.list, &feature_unit.control);
+       list_add(&volume_control.list, &feature_unit.control);
+
+       volume_control.data[UAC__CUR] = 0xffc0;
+       volume_control.data[UAC__MIN] = 0xe3a0;
+       volume_control.data[UAC__MAX] = 0xfff0;
+       volume_control.data[UAC__RES] = 0x0030;
+
+       return 0;
+}
+
+static inline
+struct f_uac1_legacy_opts *to_f_uac1_opts(struct config_item *item)
+{
+       return container_of(to_config_group(item), struct f_uac1_legacy_opts,
+                           func_inst.group);
+}
+
+static void f_uac1_attr_release(struct config_item *item)
+{
+       struct f_uac1_legacy_opts *opts = to_f_uac1_opts(item);
+
+       usb_put_function_instance(&opts->func_inst);
+}
+
+static struct configfs_item_operations f_uac1_item_ops = {
+       .release        = f_uac1_attr_release,
+};
+
+#define UAC1_INT_ATTRIBUTE(name)                                       \
+static ssize_t f_uac1_opts_##name##_show(struct config_item *item,     \
+                                        char *page)                    \
+{                                                                      \
+       struct f_uac1_legacy_opts *opts = to_f_uac1_opts(item);         \
+       int result;                                                     \
+                                                                       \
+       mutex_lock(&opts->lock);                                        \
+       result = sprintf(page, "%u\n", opts->name);                     \
+       mutex_unlock(&opts->lock);                                      \
+                                                                       \
+       return result;                                                  \
+}                                                                      \
+                                                                       \
+static ssize_t f_uac1_opts_##name##_store(struct config_item *item,            \
+                                         const char *page, size_t len) \
+{                                                                      \
+       struct f_uac1_legacy_opts *opts = to_f_uac1_opts(item);         \
+       int ret;                                                        \
+       u32 num;                                                        \
+                                                                       \
+       mutex_lock(&opts->lock);                                        \
+       if (opts->refcnt) {                                             \
+               ret = -EBUSY;                                           \
+               goto end;                                               \
+       }                                                               \
+                                                                       \
+       ret = kstrtou32(page, 0, &num);                                 \
+       if (ret)                                                        \
+               goto end;                                               \
+                                                                       \
+       opts->name = num;                                               \
+       ret = len;                                                      \
+                                                                       \
+end:                                                                   \
+       mutex_unlock(&opts->lock);                                      \
+       return ret;                                                     \
+}                                                                      \
+                                                                       \
+CONFIGFS_ATTR(f_uac1_opts_, name)
+
+UAC1_INT_ATTRIBUTE(req_buf_size);
+UAC1_INT_ATTRIBUTE(req_count);
+UAC1_INT_ATTRIBUTE(audio_buf_size);
+
+#define UAC1_STR_ATTRIBUTE(name)                                       \
+static ssize_t f_uac1_opts_##name##_show(struct config_item *item,     \
+                                        char *page)                    \
+{                                                                      \
+       struct f_uac1_legacy_opts *opts = to_f_uac1_opts(item);         \
+       int result;                                                     \
+                                                                       \
+       mutex_lock(&opts->lock);                                        \
+       result = sprintf(page, "%s\n", opts->name);                     \
+       mutex_unlock(&opts->lock);                                      \
+                                                                       \
+       return result;                                                  \
+}                                                                      \
+                                                                       \
+static ssize_t f_uac1_opts_##name##_store(struct config_item *item,    \
+                                         const char *page, size_t len) \
+{                                                                      \
+       struct f_uac1_legacy_opts *opts = to_f_uac1_opts(item);         \
+       int ret = -EBUSY;                                               \
+       char *tmp;                                                      \
+                                                                       \
+       mutex_lock(&opts->lock);                                        \
+       if (opts->refcnt)                                               \
+               goto end;                                               \
+                                                                       \
+       tmp = kstrndup(page, len, GFP_KERNEL);                          \
+       if (tmp) {                                                      \
+               ret = -ENOMEM;                                          \
+               goto end;                                               \
+       }                                                               \
+       if (opts->name##_alloc)                                         \
+               kfree(opts->name);                                      \
+       opts->name##_alloc = true;                                      \
+       opts->name = tmp;                                               \
+       ret = len;                                                      \
+                                                                       \
+end:                                                                   \
+       mutex_unlock(&opts->lock);                                      \
+       return ret;                                                     \
+}                                                                      \
+                                                                       \
+CONFIGFS_ATTR(f_uac1_opts_, name)
+
+UAC1_STR_ATTRIBUTE(fn_play);
+UAC1_STR_ATTRIBUTE(fn_cap);
+UAC1_STR_ATTRIBUTE(fn_cntl);
+
+static struct configfs_attribute *f_uac1_attrs[] = {
+       &f_uac1_opts_attr_req_buf_size,
+       &f_uac1_opts_attr_req_count,
+       &f_uac1_opts_attr_audio_buf_size,
+       &f_uac1_opts_attr_fn_play,
+       &f_uac1_opts_attr_fn_cap,
+       &f_uac1_opts_attr_fn_cntl,
+       NULL,
+};
+
+static struct config_item_type f_uac1_func_type = {
+       .ct_item_ops    = &f_uac1_item_ops,
+       .ct_attrs       = f_uac1_attrs,
+       .ct_owner       = THIS_MODULE,
+};
+
+static void f_audio_free_inst(struct usb_function_instance *f)
+{
+       struct f_uac1_legacy_opts *opts;
+
+       opts = container_of(f, struct f_uac1_legacy_opts, func_inst);
+       if (opts->fn_play_alloc)
+               kfree(opts->fn_play);
+       if (opts->fn_cap_alloc)
+               kfree(opts->fn_cap);
+       if (opts->fn_cntl_alloc)
+               kfree(opts->fn_cntl);
+       kfree(opts);
+}
+
+static struct usb_function_instance *f_audio_alloc_inst(void)
+{
+       struct f_uac1_legacy_opts *opts;
+
+       opts = kzalloc(sizeof(*opts), GFP_KERNEL);
+       if (!opts)
+               return ERR_PTR(-ENOMEM);
+
+       mutex_init(&opts->lock);
+       opts->func_inst.free_func_inst = f_audio_free_inst;
+
+       config_group_init_type_name(&opts->func_inst.group, "",
+                                   &f_uac1_func_type);
+
+       opts->req_buf_size = UAC1_OUT_EP_MAX_PACKET_SIZE;
+       opts->req_count = UAC1_REQ_COUNT;
+       opts->audio_buf_size = UAC1_AUDIO_BUF_SIZE;
+       opts->fn_play = FILE_PCM_PLAYBACK;
+       opts->fn_cap = FILE_PCM_CAPTURE;
+       opts->fn_cntl = FILE_CONTROL;
+       return &opts->func_inst;
+}
+
+static void f_audio_free(struct usb_function *f)
+{
+       struct f_audio *audio = func_to_audio(f);
+       struct f_uac1_legacy_opts *opts;
+
+       gaudio_cleanup(&audio->card);
+       opts = container_of(f->fi, struct f_uac1_legacy_opts, func_inst);
+       kfree(audio);
+       mutex_lock(&opts->lock);
+       --opts->refcnt;
+       mutex_unlock(&opts->lock);
+}
+
+static void f_audio_unbind(struct usb_configuration *c, struct usb_function *f)
+{
+       usb_free_all_descriptors(f);
+}
+
+static struct usb_function *f_audio_alloc(struct usb_function_instance *fi)
+{
+       struct f_audio *audio;
+       struct f_uac1_legacy_opts *opts;
+
+       /* allocate and initialize one new instance */
+       audio = kzalloc(sizeof(*audio), GFP_KERNEL);
+       if (!audio)
+               return ERR_PTR(-ENOMEM);
+
+       audio->card.func.name = "g_audio";
+
+       opts = container_of(fi, struct f_uac1_legacy_opts, func_inst);
+       mutex_lock(&opts->lock);
+       ++opts->refcnt;
+       mutex_unlock(&opts->lock);
+       INIT_LIST_HEAD(&audio->play_queue);
+       spin_lock_init(&audio->lock);
+
+       audio->card.func.bind = f_audio_bind;
+       audio->card.func.unbind = f_audio_unbind;
+       audio->card.func.set_alt = f_audio_set_alt;
+       audio->card.func.get_alt = f_audio_get_alt;
+       audio->card.func.setup = f_audio_setup;
+       audio->card.func.disable = f_audio_disable;
+       audio->card.func.free_func = f_audio_free;
+
+       control_selector_init(audio);
+
+       INIT_WORK(&audio->playback_work, f_audio_playback_work);
+
+       return &audio->card.func;
+}
+
+DECLARE_USB_FUNCTION_INIT(uac1_legacy, f_audio_alloc_inst, f_audio_alloc);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Bryan Wu");
diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
deleted file mode 100644 (file)
index c78c841..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * u_uac1.c -- ALSA audio utilities for Gadget stack
- *
- * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
- * Copyright (C) 2008 Analog Devices, Inc
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/device.h>
-#include <linux/delay.h>
-#include <linux/ctype.h>
-#include <linux/random.h>
-#include <linux/syscalls.h>
-
-#include "u_uac1.h"
-
-/*
- * This component encapsulates the ALSA devices for USB audio gadget
- */
-
-/*-------------------------------------------------------------------------*/
-
-/**
- * Some ALSA internal helper functions
- */
-static int snd_interval_refine_set(struct snd_interval *i, unsigned int val)
-{
-       struct snd_interval t;
-       t.empty = 0;
-       t.min = t.max = val;
-       t.openmin = t.openmax = 0;
-       t.integer = 1;
-       return snd_interval_refine(i, &t);
-}
-
-static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,
-                                snd_pcm_hw_param_t var, unsigned int val,
-                                int dir)
-{
-       int changed;
-       if (hw_is_mask(var)) {
-               struct snd_mask *m = hw_param_mask(params, var);
-               if (val == 0 && dir < 0) {
-                       changed = -EINVAL;
-                       snd_mask_none(m);
-               } else {
-                       if (dir > 0)
-                               val++;
-                       else if (dir < 0)
-                               val--;
-                       changed = snd_mask_refine_set(
-                                       hw_param_mask(params, var), val);
-               }
-       } else if (hw_is_interval(var)) {
-               struct snd_interval *i = hw_param_interval(params, var);
-               if (val == 0 && dir < 0) {
-                       changed = -EINVAL;
-                       snd_interval_none(i);
-               } else if (dir == 0)
-                       changed = snd_interval_refine_set(i, val);
-               else {
-                       struct snd_interval t;
-                       t.openmin = 1;
-                       t.openmax = 1;
-                       t.empty = 0;
-                       t.integer = 0;
-                       if (dir < 0) {
-                               t.min = val - 1;
-                               t.max = val;
-                       } else {
-                               t.min = val;
-                               t.max = val+1;
-                       }
-                       changed = snd_interval_refine(i, &t);
-               }
-       } else
-               return -EINVAL;
-       if (changed) {
-               params->cmask |= 1 << var;
-               params->rmask |= 1 << var;
-       }
-       return changed;
-}
-/*-------------------------------------------------------------------------*/
-
-/**
- * Set default hardware params
- */
-static int playback_default_hw_params(struct gaudio_snd_dev *snd)
-{
-       struct snd_pcm_substream *substream = snd->substream;
-       struct snd_pcm_hw_params *params;
-       snd_pcm_sframes_t result;
-
-       /*
-       * SNDRV_PCM_ACCESS_RW_INTERLEAVED,
-       * SNDRV_PCM_FORMAT_S16_LE
-       * CHANNELS: 2
-       * RATE: 48000
-       */
-       snd->access = SNDRV_PCM_ACCESS_RW_INTERLEAVED;
-       snd->format = SNDRV_PCM_FORMAT_S16_LE;
-       snd->channels = 2;
-       snd->rate = 48000;
-
-       params = kzalloc(sizeof(*params), GFP_KERNEL);
-       if (!params)
-               return -ENOMEM;
-
-       _snd_pcm_hw_params_any(params);
-       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_ACCESS,
-                       snd->access, 0);
-       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_FORMAT,
-                       snd->format, 0);
-       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_CHANNELS,
-                       snd->channels, 0);
-       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_RATE,
-                       snd->rate, 0);
-
-       snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);
-       snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, params);
-
-       result = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_PREPARE, NULL);
-       if (result < 0) {
-               ERROR(snd->card,
-                       "Preparing sound card failed: %d\n", (int)result);
-               kfree(params);
-               return result;
-       }
-
-       /* Store the hardware parameters */
-       snd->access = params_access(params);
-       snd->format = params_format(params);
-       snd->channels = params_channels(params);
-       snd->rate = params_rate(params);
-
-       kfree(params);
-
-       INFO(snd->card,
-               "Hardware params: access %x, format %x, channels %d, rate %d\n",
-               snd->access, snd->format, snd->channels, snd->rate);
-
-       return 0;
-}
-
-/**
- * Playback audio buffer data by ALSA PCM device
- */
-size_t u_audio_playback(struct gaudio *card, void *buf, size_t count)
-{
-       struct gaudio_snd_dev   *snd = &card->playback;
-       struct snd_pcm_substream *substream = snd->substream;
-       struct snd_pcm_runtime *runtime = substream->runtime;
-       mm_segment_t old_fs;
-       ssize_t result;
-       snd_pcm_sframes_t frames;
-
-try_again:
-       if (runtime->status->state == SNDRV_PCM_STATE_XRUN ||
-               runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
-               result = snd_pcm_kernel_ioctl(substream,
-                               SNDRV_PCM_IOCTL_PREPARE, NULL);
-               if (result < 0) {
-                       ERROR(card, "Preparing sound card failed: %d\n",
-                                       (int)result);
-                       return result;
-               }
-       }
-
-       frames = bytes_to_frames(runtime, count);
-       old_fs = get_fs();
-       set_fs(KERNEL_DS);
-       result = snd_pcm_lib_write(snd->substream, (void __user *)buf, frames);
-       if (result != frames) {
-               ERROR(card, "Playback error: %d\n", (int)result);
-               set_fs(old_fs);
-               goto try_again;
-       }
-       set_fs(old_fs);
-
-       return 0;
-}
-
-int u_audio_get_playback_channels(struct gaudio *card)
-{
-       return card->playback.channels;
-}
-
-int u_audio_get_playback_rate(struct gaudio *card)
-{
-       return card->playback.rate;
-}
-
-/**
- * Open ALSA PCM and control device files
- * Initial the PCM or control device
- */
-static int gaudio_open_snd_dev(struct gaudio *card)
-{
-       struct snd_pcm_file *pcm_file;
-       struct gaudio_snd_dev *snd;
-       struct f_uac1_opts *opts;
-       char *fn_play, *fn_cap, *fn_cntl;
-
-       opts = container_of(card->func.fi, struct f_uac1_opts, func_inst);
-       fn_play = opts->fn_play;
-       fn_cap = opts->fn_cap;
-       fn_cntl = opts->fn_cntl;
-
-       /* Open control device */
-       snd = &card->control;
-       snd->filp = filp_open(fn_cntl, O_RDWR, 0);
-       if (IS_ERR(snd->filp)) {
-               int ret = PTR_ERR(snd->filp);
-               ERROR(card, "unable to open sound control device file: %s\n",
-                               fn_cntl);
-               snd->filp = NULL;
-               return ret;
-       }
-       snd->card = card;
-
-       /* Open PCM playback device and setup substream */
-       snd = &card->playback;
-       snd->filp = filp_open(fn_play, O_WRONLY, 0);
-       if (IS_ERR(snd->filp)) {
-               int ret = PTR_ERR(snd->filp);
-
-               ERROR(card, "No such PCM playback device: %s\n", fn_play);
-               snd->filp = NULL;
-               return ret;
-       }
-       pcm_file = snd->filp->private_data;
-       snd->substream = pcm_file->substream;
-       snd->card = card;
-       playback_default_hw_params(snd);
-
-       /* Open PCM capture device and setup substream */
-       snd = &card->capture;
-       snd->filp = filp_open(fn_cap, O_RDONLY, 0);
-       if (IS_ERR(snd->filp)) {
-               ERROR(card, "No such PCM capture device: %s\n", fn_cap);
-               snd->substream = NULL;
-               snd->card = NULL;
-               snd->filp = NULL;
-       } else {
-               pcm_file = snd->filp->private_data;
-               snd->substream = pcm_file->substream;
-               snd->card = card;
-       }
-
-       return 0;
-}
-
-/**
- * Close ALSA PCM and control device files
- */
-static int gaudio_close_snd_dev(struct gaudio *gau)
-{
-       struct gaudio_snd_dev   *snd;
-
-       /* Close control device */
-       snd = &gau->control;
-       if (snd->filp)
-               filp_close(snd->filp, NULL);
-
-       /* Close PCM playback device and setup substream */
-       snd = &gau->playback;
-       if (snd->filp)
-               filp_close(snd->filp, NULL);
-
-       /* Close PCM capture device and setup substream */
-       snd = &gau->capture;
-       if (snd->filp)
-               filp_close(snd->filp, NULL);
-
-       return 0;
-}
-
-/**
- * gaudio_setup - setup ALSA interface and preparing for USB transfer
- *
- * This sets up PCM, mixer or MIDI ALSA devices fore USB gadget using.
- *
- * Returns negative errno, or zero on success
- */
-int gaudio_setup(struct gaudio *card)
-{
-       int     ret;
-
-       ret = gaudio_open_snd_dev(card);
-       if (ret)
-               ERROR(card, "we need at least one control device\n");
-
-       return ret;
-
-}
-
-/**
- * gaudio_cleanup - remove ALSA device interface
- *
- * This is called to free all resources allocated by @gaudio_setup().
- */
-void gaudio_cleanup(struct gaudio *the_card)
-{
-       if (the_card)
-               gaudio_close_snd_dev(the_card);
-}
-
diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h
deleted file mode 100644 (file)
index 5c2ac8e..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * u_uac1.h -- interface to USB gadget "ALSA AUDIO" utilities
- *
- * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
- * Copyright (C) 2008 Analog Devices, Inc
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#ifndef __U_AUDIO_H
-#define __U_AUDIO_H
-
-#include <linux/device.h>
-#include <linux/err.h>
-#include <linux/usb/audio.h>
-#include <linux/usb/composite.h>
-
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-
-#define FILE_PCM_PLAYBACK      "/dev/snd/pcmC0D0p"
-#define FILE_PCM_CAPTURE       "/dev/snd/pcmC0D0c"
-#define FILE_CONTROL           "/dev/snd/controlC0"
-
-#define UAC1_OUT_EP_MAX_PACKET_SIZE    200
-#define UAC1_REQ_COUNT                 256
-#define UAC1_AUDIO_BUF_SIZE            48000
-
-/*
- * This represents the USB side of an audio card device, managed by a USB
- * function which provides control and stream interfaces.
- */
-
-struct gaudio_snd_dev {
-       struct gaudio                   *card;
-       struct file                     *filp;
-       struct snd_pcm_substream        *substream;
-       int                             access;
-       int                             format;
-       int                             channels;
-       int                             rate;
-};
-
-struct gaudio {
-       struct usb_function             func;
-       struct usb_gadget               *gadget;
-
-       /* ALSA sound device interfaces */
-       struct gaudio_snd_dev           control;
-       struct gaudio_snd_dev           playback;
-       struct gaudio_snd_dev           capture;
-
-       /* TODO */
-};
-
-struct f_uac1_opts {
-       struct usb_function_instance    func_inst;
-       int                             req_buf_size;
-       int                             req_count;
-       int                             audio_buf_size;
-       char                            *fn_play;
-       char                            *fn_cap;
-       char                            *fn_cntl;
-       unsigned                        bound:1;
-       unsigned                        fn_play_alloc:1;
-       unsigned                        fn_cap_alloc:1;
-       unsigned                        fn_cntl_alloc:1;
-       struct mutex                    lock;
-       int                             refcnt;
-};
-
-int gaudio_setup(struct gaudio *card);
-void gaudio_cleanup(struct gaudio *the_card);
-
-size_t u_audio_playback(struct gaudio *card, void *buf, size_t count);
-int u_audio_get_playback_channels(struct gaudio *card);
-int u_audio_get_playback_rate(struct gaudio *card);
-
-#endif /* __U_AUDIO_H */
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c
new file mode 100644 (file)
index 0000000..8aa76b4
--- /dev/null
@@ -0,0 +1,315 @@
+/*
+ * u_uac1.c -- ALSA audio utilities for Gadget stack
+ *
+ * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
+ * Copyright (C) 2008 Analog Devices, Inc
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/ctype.h>
+#include <linux/random.h>
+#include <linux/syscalls.h>
+
+#include "u_uac1_legacy.h"
+
+/*
+ * This component encapsulates the ALSA devices for USB audio gadget
+ */
+
+/*-------------------------------------------------------------------------*/
+
+/**
+ * Some ALSA internal helper functions
+ */
+static int snd_interval_refine_set(struct snd_interval *i, unsigned int val)
+{
+       struct snd_interval t;
+       t.empty = 0;
+       t.min = t.max = val;
+       t.openmin = t.openmax = 0;
+       t.integer = 1;
+       return snd_interval_refine(i, &t);
+}
+
+static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,
+                                snd_pcm_hw_param_t var, unsigned int val,
+                                int dir)
+{
+       int changed;
+       if (hw_is_mask(var)) {
+               struct snd_mask *m = hw_param_mask(params, var);
+               if (val == 0 && dir < 0) {
+                       changed = -EINVAL;
+                       snd_mask_none(m);
+               } else {
+                       if (dir > 0)
+                               val++;
+                       else if (dir < 0)
+                               val--;
+                       changed = snd_mask_refine_set(
+                                       hw_param_mask(params, var), val);
+               }
+       } else if (hw_is_interval(var)) {
+               struct snd_interval *i = hw_param_interval(params, var);
+               if (val == 0 && dir < 0) {
+                       changed = -EINVAL;
+                       snd_interval_none(i);
+               } else if (dir == 0)
+                       changed = snd_interval_refine_set(i, val);
+               else {
+                       struct snd_interval t;
+                       t.openmin = 1;
+                       t.openmax = 1;
+                       t.empty = 0;
+                       t.integer = 0;
+                       if (dir < 0) {
+                               t.min = val - 1;
+                               t.max = val;
+                       } else {
+                               t.min = val;
+                               t.max = val+1;
+                       }
+                       changed = snd_interval_refine(i, &t);
+               }
+       } else
+               return -EINVAL;
+       if (changed) {
+               params->cmask |= 1 << var;
+               params->rmask |= 1 << var;
+       }
+       return changed;
+}
+/*-------------------------------------------------------------------------*/
+
+/**
+ * Set default hardware params
+ */
+static int playback_default_hw_params(struct gaudio_snd_dev *snd)
+{
+       struct snd_pcm_substream *substream = snd->substream;
+       struct snd_pcm_hw_params *params;
+       snd_pcm_sframes_t result;
+
+       /*
+       * SNDRV_PCM_ACCESS_RW_INTERLEAVED,
+       * SNDRV_PCM_FORMAT_S16_LE
+       * CHANNELS: 2
+       * RATE: 48000
+       */
+       snd->access = SNDRV_PCM_ACCESS_RW_INTERLEAVED;
+       snd->format = SNDRV_PCM_FORMAT_S16_LE;
+       snd->channels = 2;
+       snd->rate = 48000;
+
+       params = kzalloc(sizeof(*params), GFP_KERNEL);
+       if (!params)
+               return -ENOMEM;
+
+       _snd_pcm_hw_params_any(params);
+       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_ACCESS,
+                       snd->access, 0);
+       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_FORMAT,
+                       snd->format, 0);
+       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_CHANNELS,
+                       snd->channels, 0);
+       _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_RATE,
+                       snd->rate, 0);
+
+       snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);
+       snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, params);
+
+       result = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_PREPARE, NULL);
+       if (result < 0) {
+               ERROR(snd->card,
+                       "Preparing sound card failed: %d\n", (int)result);
+               kfree(params);
+               return result;
+       }
+
+       /* Store the hardware parameters */
+       snd->access = params_access(params);
+       snd->format = params_format(params);
+       snd->channels = params_channels(params);
+       snd->rate = params_rate(params);
+
+       kfree(params);
+
+       INFO(snd->card,
+               "Hardware params: access %x, format %x, channels %d, rate %d\n",
+               snd->access, snd->format, snd->channels, snd->rate);
+
+       return 0;
+}
+
+/**
+ * Playback audio buffer data by ALSA PCM device
+ */
+size_t u_audio_playback(struct gaudio *card, void *buf, size_t count)
+{
+       struct gaudio_snd_dev   *snd = &card->playback;
+       struct snd_pcm_substream *substream = snd->substream;
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       mm_segment_t old_fs;
+       ssize_t result;
+       snd_pcm_sframes_t frames;
+
+try_again:
+       if (runtime->status->state == SNDRV_PCM_STATE_XRUN ||
+               runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
+               result = snd_pcm_kernel_ioctl(substream,
+                               SNDRV_PCM_IOCTL_PREPARE, NULL);
+               if (result < 0) {
+                       ERROR(card, "Preparing sound card failed: %d\n",
+                                       (int)result);
+                       return result;
+               }
+       }
+
+       frames = bytes_to_frames(runtime, count);
+       old_fs = get_fs();
+       set_fs(KERNEL_DS);
+       result = snd_pcm_lib_write(snd->substream, (void __user *)buf, frames);
+       if (result != frames) {
+               ERROR(card, "Playback error: %d\n", (int)result);
+               set_fs(old_fs);
+               goto try_again;
+       }
+       set_fs(old_fs);
+
+       return 0;
+}
+
+int u_audio_get_playback_channels(struct gaudio *card)
+{
+       return card->playback.channels;
+}
+
+int u_audio_get_playback_rate(struct gaudio *card)
+{
+       return card->playback.rate;
+}
+
+/**
+ * Open ALSA PCM and control device files
+ * Initial the PCM or control device
+ */
+static int gaudio_open_snd_dev(struct gaudio *card)
+{
+       struct snd_pcm_file *pcm_file;
+       struct gaudio_snd_dev *snd;
+       struct f_uac1_legacy_opts *opts;
+       char *fn_play, *fn_cap, *fn_cntl;
+
+       opts = container_of(card->func.fi, struct f_uac1_legacy_opts,
+                           func_inst);
+       fn_play = opts->fn_play;
+       fn_cap = opts->fn_cap;
+       fn_cntl = opts->fn_cntl;
+
+       /* Open control device */
+       snd = &card->control;
+       snd->filp = filp_open(fn_cntl, O_RDWR, 0);
+       if (IS_ERR(snd->filp)) {
+               int ret = PTR_ERR(snd->filp);
+               ERROR(card, "unable to open sound control device file: %s\n",
+                               fn_cntl);
+               snd->filp = NULL;
+               return ret;
+       }
+       snd->card = card;
+
+       /* Open PCM playback device and setup substream */
+       snd = &card->playback;
+       snd->filp = filp_open(fn_play, O_WRONLY, 0);
+       if (IS_ERR(snd->filp)) {
+               int ret = PTR_ERR(snd->filp);
+
+               ERROR(card, "No such PCM playback device: %s\n", fn_play);
+               snd->filp = NULL;
+               return ret;
+       }
+       pcm_file = snd->filp->private_data;
+       snd->substream = pcm_file->substream;
+       snd->card = card;
+       playback_default_hw_params(snd);
+
+       /* Open PCM capture device and setup substream */
+       snd = &card->capture;
+       snd->filp = filp_open(fn_cap, O_RDONLY, 0);
+       if (IS_ERR(snd->filp)) {
+               ERROR(card, "No such PCM capture device: %s\n", fn_cap);
+               snd->substream = NULL;
+               snd->card = NULL;
+               snd->filp = NULL;
+       } else {
+               pcm_file = snd->filp->private_data;
+               snd->substream = pcm_file->substream;
+               snd->card = card;
+       }
+
+       return 0;
+}
+
+/**
+ * Close ALSA PCM and control device files
+ */
+static int gaudio_close_snd_dev(struct gaudio *gau)
+{
+       struct gaudio_snd_dev   *snd;
+
+       /* Close control device */
+       snd = &gau->control;
+       if (snd->filp)
+               filp_close(snd->filp, NULL);
+
+       /* Close PCM playback device and setup substream */
+       snd = &gau->playback;
+       if (snd->filp)
+               filp_close(snd->filp, NULL);
+
+       /* Close PCM capture device and setup substream */
+       snd = &gau->capture;
+       if (snd->filp)
+               filp_close(snd->filp, NULL);
+
+       return 0;
+}
+
+/**
+ * gaudio_setup - setup ALSA interface and preparing for USB transfer
+ *
+ * This sets up PCM, mixer or MIDI ALSA devices fore USB gadget using.
+ *
+ * Returns negative errno, or zero on success
+ */
+int gaudio_setup(struct gaudio *card)
+{
+       int     ret;
+
+       ret = gaudio_open_snd_dev(card);
+       if (ret)
+               ERROR(card, "we need at least one control device\n");
+
+       return ret;
+
+}
+
+/**
+ * gaudio_cleanup - remove ALSA device interface
+ *
+ * This is called to free all resources allocated by @gaudio_setup().
+ */
+void gaudio_cleanup(struct gaudio *the_card)
+{
+       if (the_card)
+               gaudio_close_snd_dev(the_card);
+}
+
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.h b/drivers/usb/gadget/function/u_uac1_legacy.h
new file mode 100644 (file)
index 0000000..d715b1a
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * u_uac1.h -- interface to USB gadget "ALSA AUDIO" utilities
+ *
+ * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
+ * Copyright (C) 2008 Analog Devices, Inc
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __U_UAC1_LEGACY_H
+#define __U_UAC1_LEGACY_H
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/usb/audio.h>
+#include <linux/usb/composite.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+
+#define FILE_PCM_PLAYBACK      "/dev/snd/pcmC0D0p"
+#define FILE_PCM_CAPTURE       "/dev/snd/pcmC0D0c"
+#define FILE_CONTROL           "/dev/snd/controlC0"
+
+#define UAC1_OUT_EP_MAX_PACKET_SIZE    200
+#define UAC1_REQ_COUNT                 256
+#define UAC1_AUDIO_BUF_SIZE            48000
+
+/*
+ * This represents the USB side of an audio card device, managed by a USB
+ * function which provides control and stream interfaces.
+ */
+
+struct gaudio_snd_dev {
+       struct gaudio                   *card;
+       struct file                     *filp;
+       struct snd_pcm_substream        *substream;
+       int                             access;
+       int                             format;
+       int                             channels;
+       int                             rate;
+};
+
+struct gaudio {
+       struct usb_function             func;
+       struct usb_gadget               *gadget;
+
+       /* ALSA sound device interfaces */
+       struct gaudio_snd_dev           control;
+       struct gaudio_snd_dev           playback;
+       struct gaudio_snd_dev           capture;
+
+       /* TODO */
+};
+
+struct f_uac1_legacy_opts {
+       struct usb_function_instance    func_inst;
+       int                             req_buf_size;
+       int                             req_count;
+       int                             audio_buf_size;
+       char                            *fn_play;
+       char                            *fn_cap;
+       char                            *fn_cntl;
+       unsigned                        bound:1;
+       unsigned                        fn_play_alloc:1;
+       unsigned                        fn_cap_alloc:1;
+       unsigned                        fn_cntl_alloc:1;
+       struct mutex                    lock;
+       int                             refcnt;
+};
+
+int gaudio_setup(struct gaudio *card);
+void gaudio_cleanup(struct gaudio *the_card);
+
+size_t u_audio_playback(struct gaudio *card, void *buf, size_t count);
+int u_audio_get_playback_channels(struct gaudio *card);
+int u_audio_get_playback_rate(struct gaudio *card);
+
+#endif /* __U_UAC1_LEGACY_H */
index 5344064f5721d7a70fa4b97fc3a0d09580a4eb3b..87bacb638a9ce83e26f5a1cb55eceba4c430a4dd 100644 (file)
@@ -54,8 +54,8 @@ config USB_AUDIO
        depends on SND
        select USB_LIBCOMPOSITE
        select SND_PCM
-       select USB_F_UAC1 if GADGET_UAC1
-       select USB_F_UAC2 if !GADGET_UAC1
+       select USB_F_UAC1_LEGACY if GADGET_UAC1_LEGACY
+       select USB_F_UAC2 if !GADGET_UAC1_LEGACY
        select USB_U_AUDIO if USB_F_UAC2
        help
          This Gadget Audio driver is compatible with USB Audio Class
@@ -73,7 +73,7 @@ config USB_AUDIO
          Say "y" to link the driver statically, or "m" to build a
          dynamically linked module called "g_audio".
 
-config GADGET_UAC1
+config GADGET_UAC1_LEGACY
        bool "UAC 1.0 (Legacy)"
        depends on USB_AUDIO
        help
index 8a39f42a4d56232bf5c1a0b8a3e1d0668f9305c2..bf5592a5b9e94b0c1e6044e51e44c472b24ac63b 100644 (file)
@@ -20,7 +20,7 @@
 
 USB_GADGET_COMPOSITE_OPTIONS();
 
-#ifndef CONFIG_GADGET_UAC1
+#ifndef CONFIG_GADGET_UAC1_LEGACY
 #include "u_uac2.h"
 
 /* Playback(USB-IN) Default Stereo - Fl/Fr */
@@ -53,7 +53,7 @@ static int c_ssize = UAC2_DEF_CSSIZE;
 module_param(c_ssize, uint, S_IRUGO);
 MODULE_PARM_DESC(c_ssize, "Capture Sample Size(bytes)");
 #else
-#include "u_uac1.h"
+#include "u_uac1_legacy.h"
 
 static char *fn_play = FILE_PCM_PLAYBACK;
 module_param(fn_play, charp, S_IRUGO);
@@ -99,7 +99,7 @@ static struct usb_gadget_strings *audio_strings[] = {
        NULL,
 };
 
-#ifndef CONFIG_GADGET_UAC1
+#ifndef CONFIG_GADGET_UAC1_LEGACY
 static struct usb_function_instance *fi_uac2;
 static struct usb_function *f_uac2;
 #else
@@ -125,7 +125,7 @@ static struct usb_device_descriptor device_desc = {
 
        /* .bcdUSB = DYNAMIC */
 
-#ifdef CONFIG_GADGET_UAC1
+#ifdef CONFIG_GADGET_UAC1_LEGACY
        .bDeviceClass =         USB_CLASS_PER_INTERFACE,
        .bDeviceSubClass =      0,
        .bDeviceProtocol =      0,
@@ -164,7 +164,7 @@ static int audio_do_config(struct usb_configuration *c)
                c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
        }
 
-#ifdef CONFIG_GADGET_UAC1
+#ifdef CONFIG_GADGET_UAC1_LEGACY
        f_uac1 = usb_get_function(fi_uac1);
        if (IS_ERR(f_uac1)) {
                status = PTR_ERR(f_uac1);
@@ -204,24 +204,24 @@ static struct usb_configuration audio_config_driver = {
 
 static int audio_bind(struct usb_composite_dev *cdev)
 {
-#ifndef CONFIG_GADGET_UAC1
+#ifndef CONFIG_GADGET_UAC1_LEGACY
        struct f_uac2_opts      *uac2_opts;
 #else
-       struct f_uac1_opts      *uac1_opts;
+       struct f_uac1_legacy_opts       *uac1_opts;
 #endif
        int                     status;
 
-#ifndef CONFIG_GADGET_UAC1
+#ifndef CONFIG_GADGET_UAC1_LEGACY
        fi_uac2 = usb_get_function_instance("uac2");
        if (IS_ERR(fi_uac2))
                return PTR_ERR(fi_uac2);
 #else
-       fi_uac1 = usb_get_function_instance("uac1");
+       fi_uac1 = usb_get_function_instance("uac1_legacy");
        if (IS_ERR(fi_uac1))
                return PTR_ERR(fi_uac1);
 #endif
 
-#ifndef CONFIG_GADGET_UAC1
+#ifndef CONFIG_GADGET_UAC1_LEGACY
        uac2_opts = container_of(fi_uac2, struct f_uac2_opts, func_inst);
        uac2_opts->p_chmask = p_chmask;
        uac2_opts->p_srate = p_srate;
@@ -231,7 +231,7 @@ static int audio_bind(struct usb_composite_dev *cdev)
        uac2_opts->c_ssize = c_ssize;
        uac2_opts->req_number = UAC2_DEF_REQ_NUM;
 #else
-       uac1_opts = container_of(fi_uac1, struct f_uac1_opts, func_inst);
+       uac1_opts = container_of(fi_uac1, struct f_uac1_legacy_opts, func_inst);
        uac1_opts->fn_play = fn_play;
        uac1_opts->fn_cap = fn_cap;
        uac1_opts->fn_cntl = fn_cntl;
@@ -269,7 +269,7 @@ fail_otg_desc:
        kfree(otg_desc[0]);
        otg_desc[0] = NULL;
 fail:
-#ifndef CONFIG_GADGET_UAC1
+#ifndef CONFIG_GADGET_UAC1_LEGACY
        usb_put_function_instance(fi_uac2);
 #else
        usb_put_function_instance(fi_uac1);
@@ -279,7 +279,7 @@ fail:
 
 static int audio_unbind(struct usb_composite_dev *cdev)
 {
-#ifdef CONFIG_GADGET_UAC1
+#ifdef CONFIG_GADGET_UAC1_LEGACY
        if (!IS_ERR_OR_NULL(f_uac1))
                usb_put_function(f_uac1);
        if (!IS_ERR_OR_NULL(fi_uac1))