1 files changed, 139 insertions, 10 deletions

diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index 6eb695e5e43a..f46a3956e43d 100644
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -21,6 +21,66 @@
 
 USB_GADGET_COMPOSITE_OPTIONS();
 
+#ifndef CONFIG_GADGET_UAC1
+#include "u_uac2.h"
+
+/* Playback(USB-IN) Default Stereo - Fl/Fr */
+static int p_chmask = UAC2_DEF_PCHMASK;
+module_param(p_chmask, uint, S_IRUGO);
+MODULE_PARM_DESC(p_chmask, "Playback Channel Mask");
+
+/* Playback Default 48 KHz */
+static int p_srate = UAC2_DEF_PSRATE;
+module_param(p_srate, uint, S_IRUGO);
+MODULE_PARM_DESC(p_srate, "Playback Sampling Rate");
+
+/* Playback Default 16bits/sample */
+static int p_ssize = UAC2_DEF_PSSIZE;
+module_param(p_ssize, uint, S_IRUGO);
+MODULE_PARM_DESC(p_ssize, "Playback Sample Size(bytes)");
+
+/* Capture(USB-OUT) Default Stereo - Fl/Fr */
+static int c_chmask = UAC2_DEF_CCHMASK;
+module_param(c_chmask, uint, S_IRUGO);
+MODULE_PARM_DESC(c_chmask, "Capture Channel Mask");
+
+/* Capture Default 64 KHz */
+static int c_srate = UAC2_DEF_CSRATE;
+module_param(c_srate, uint, S_IRUGO);
+MODULE_PARM_DESC(c_srate, "Capture Sampling Rate");
+
+/* Capture Default 16bits/sample */
+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"
+
+static char *fn_play = FILE_PCM_PLAYBACK;
+module_param(fn_play, charp, S_IRUGO);
+MODULE_PARM_DESC(fn_play, "Playback PCM device file name");
+
+static char *fn_cap = FILE_PCM_CAPTURE;
+module_param(fn_cap, charp, S_IRUGO);
+MODULE_PARM_DESC(fn_cap, "Capture PCM device file name");
+
+static char *fn_cntl = FILE_CONTROL;
+module_param(fn_cntl, charp, S_IRUGO);
+MODULE_PARM_DESC(fn_cntl, "Control device file name");
+
+static int req_buf_size = UAC1_OUT_EP_MAX_PACKET_SIZE;
+module_param(req_buf_size, int, S_IRUGO);
+MODULE_PARM_DESC(req_buf_size, "ISO OUT endpoint request buffer size");
+
+static int req_count = UAC1_REQ_COUNT;
+module_param(req_count, int, S_IRUGO);
+MODULE_PARM_DESC(req_count, "ISO OUT endpoint request count");
+
+static int audio_buf_size = UAC1_AUDIO_BUF_SIZE;
+module_param(audio_buf_size, int, S_IRUGO);
+MODULE_PARM_DESC(audio_buf_size, "Audio buffer size");
+#endif
+
 /* string IDs are assigned dynamically */
 
 static struct usb_string strings_dev[] = {
@@ -40,12 +100,12 @@ static struct usb_gadget_strings *audio_strings[] = {
         NULL,
 };
 
-#ifdef CONFIG_GADGET_UAC1
-#include "u_uac1.h"
-#include "u_uac1.c"
-#include "f_uac1.c"
+#ifndef CONFIG_GADGET_UAC1
+static struct usb_function_instance *fi_uac2;
+static struct usb_function *f_uac2;
 #else
-#include "f_uac2.c"
+static struct usb_function_instance *fi_uac1;
+static struct usb_function *f_uac1;
 #endif
 
 /*-------------------------------------------------------------------------*/
@@ -109,6 +169,8 @@ static const struct usb_descriptor_header *otg_desc[] = {
 
 static int __init audio_do_config(struct usb_configuration *c)
 {
+        int status;
+
         /* FIXME alloc iConfiguration string, set it in c->strings */
 
         if (gadget_is_otg(c->cdev->gadget)) {
@@ -116,7 +178,31 @@ static int __init audio_do_config(struct usb_configuration *c)
                 c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
         }
 
-        audio_bind_config(c);
+#ifdef CONFIG_GADGET_UAC1
+        f_uac1 = usb_get_function(fi_uac1);
+        if (IS_ERR(f_uac1)) {
+                status = PTR_ERR(f_uac1);
+                return status;
+        }
+
+        status = usb_add_function(c, f_uac1);
+        if (status < 0) {
+                usb_put_function(f_uac1);
+                return status;
+        }
+#else
+        f_uac2 = usb_get_function(fi_uac2);
+        if (IS_ERR(f_uac2)) {
+                status = PTR_ERR(f_uac2);
+                return status;
+        }
+
+        status = usb_add_function(c, f_uac2);
+        if (status < 0) {
+                usb_put_function(f_uac2);
+                return status;
+        }
+#endif
 
         return 0;
 }
@@ -126,17 +212,47 @@ static struct usb_configuration audio_config_driver = {
         .bConfigurationValue    = 1,
         /* .iConfiguration = DYNAMIC */
         .bmAttributes           = USB_CONFIG_ATT_SELFPOWER,
-#ifndef CONFIG_GADGET_UAC1
-        .unbind                 = uac2_unbind_config,
-#endif
 };
 
 /*-------------------------------------------------------------------------*/
 
 static int __init audio_bind(struct usb_composite_dev *cdev)
 {
+#ifndef CONFIG_GADGET_UAC1
+        struct f_uac2_opts      *uac2_opts;
+#else
+        struct f_uac1_opts      *uac1_opts;
+#endif
         int                     status;
 
+#ifndef CONFIG_GADGET_UAC1
+        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");
+        if (IS_ERR(fi_uac1))
+                return PTR_ERR(fi_uac1);
+#endif
+
+#ifndef CONFIG_GADGET_UAC1
+        uac2_opts = container_of(fi_uac2, struct f_uac2_opts, func_inst);
+        uac2_opts->p_chmask = p_chmask;
+        uac2_opts->p_srate = p_srate;
+        uac2_opts->p_ssize = p_ssize;
+        uac2_opts->c_chmask = c_chmask;
+        uac2_opts->c_srate = c_srate;
+        uac2_opts->c_ssize = c_ssize;
+#else
+        uac1_opts = container_of(fi_uac1, struct f_uac1_opts, func_inst);
+        uac1_opts->fn_play = fn_play;
+        uac1_opts->fn_cap = fn_cap;
+        uac1_opts->fn_cntl = fn_cntl;
+        uac1_opts->req_buf_size = req_buf_size;
+        uac1_opts->req_count = req_count;
+        uac1_opts->audio_buf_size = audio_buf_size;
+#endif
+
         status = usb_string_ids_tab(cdev, strings_dev);
         if (status < 0)
                 goto fail;
@@ -152,13 +268,26 @@ static int __init audio_bind(struct usb_composite_dev *cdev)
         return 0;
 
 fail:
+#ifndef CONFIG_GADGET_UAC1
+        usb_put_function_instance(fi_uac2);
+#else
+        usb_put_function_instance(fi_uac1);
+#endif
         return status;
 }
 
 static int __exit audio_unbind(struct usb_composite_dev *cdev)
 {
 #ifdef CONFIG_GADGET_UAC1
-        gaudio_cleanup();
+        if (!IS_ERR_OR_NULL(f_uac1))
+                usb_put_function(f_uac1);
+        if (!IS_ERR_OR_NULL(fi_uac1))
+                usb_put_function_instance(fi_uac1);
+#else
+        if (!IS_ERR_OR_NULL(f_uac2))
+                usb_put_function(f_uac2);
+        if (!IS_ERR_OR_NULL(fi_uac2))
+                usb_put_function_instance(fi_uac2);
 #endif
         return 0;
 }