Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d747a916 authored by Jassi Brar's avatar Jassi Brar Committed by Felipe Balbi
Browse files

usb: gadget: audio: Move string IDs to audio.c 



Move manufacturer and product string ids into audio.c so
as to be reusable by the new uac2 version of gadget driver.

Signed-off-by: default avatarYadi Brar <yadi.brar01@gmail.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0d4e1b2a

drivers/usb/gadget/audio.c

+23 −0
Original line number Diff line number Diff line
@@ -33,6 +33,29 @@ 
#include "config.c"

#include "epautoconf.c"



/* string IDs are assigned dynamically */



#define STRING_MANUFACTURER_IDX		0

#define STRING_PRODUCT_IDX		1



static char manufacturer[50];



static struct usb_string strings_dev[] = {

	[STRING_MANUFACTURER_IDX].s = manufacturer,

	[STRING_PRODUCT_IDX].s = DRIVER_DESC,

	{  } /* end of list */

};



static struct usb_gadget_strings stringtab_dev = {

	.language = 0x0409,	/* en-us */

	.strings = strings_dev,

};



static struct usb_gadget_strings *audio_strings[] = {

	&stringtab_dev,

	NULL,

};



#include "u_uac1.c"

#include "f_uac1.c"

drivers/usb/gadget/f_uac1.c

+0 −23
Original line number Diff line number Diff line
@@ -216,29 +216,6 @@ static struct usb_descriptor_header *f_audio_desc[] __initdata = { 
	NULL,

};



/* string IDs are assigned dynamically */



#define STRING_MANUFACTURER_IDX		0

#define STRING_PRODUCT_IDX		1



static char manufacturer[50];



static struct usb_string strings_dev[] = {

	[STRING_MANUFACTURER_IDX].s = manufacturer,

	[STRING_PRODUCT_IDX].s = DRIVER_DESC,

	{  } /* end of list */

};



static struct usb_gadget_strings stringtab_dev = {

	.language	= 0x0409,	/* en-us */

	.strings	= strings_dev,

};



static struct usb_gadget_strings *audio_strings[] = {

	&stringtab_dev,

	NULL,

};



/*

 * This function is an ALSA sound card following USB Audio Class Spec 1.0.

 */