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

Commit 276e2e4f authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: gadget: make sure each gadget is using same index for Product, Serial,… 



The index in usb_string array is defined by the gadget. The gadget can
choose which index entry it assigns for the serial number and which the
product name. The gadget has just to ensure that the descriptor contains
the proper string id which is assigned by composite.
If the composite layer knows the index of the "default" information
which will be overwritten by module parameters, it can be used later to
overwrite it.

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 7d16e8d3

drivers/usb/gadget/acm_ms.c

+5 −7
Original line number Diff line number Diff line
@@ -90,14 +90,12 @@ static const struct usb_descriptor_header *otg_desc[] = { 


/* 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,

	[USB_GADGET_MANUFACTURER_IDX].s = manufacturer,

	[USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC,

	[USB_GADGET_SERIAL_IDX].s = "",

	{  } /* end of list */

};
@@ -196,8 +194,8 @@ static int __init acm_ms_bind(struct usb_composite_dev *cdev) 
	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail1;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;

	device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;



	/* register our configuration */

	status = usb_add_config(cdev, &acm_ms_config_driver, acm_ms_do_config);

drivers/usb/gadget/audio.c

+5 −7
Original line number Diff line number Diff line
@@ -33,14 +33,12 @@ USB_GADGET_COMPOSITE_OPTIONS(); 


/* 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,

	[USB_GADGET_MANUFACTURER_IDX].s = manufacturer,

	[USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC,

	[USB_GADGET_SERIAL_IDX].s = "",

	{  } /* end of list */

};
@@ -170,8 +168,8 @@ static int __init audio_bind(struct usb_composite_dev *cdev) 
	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;

	device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;



	status = usb_add_config(cdev, &audio_config_driver, audio_do_config);

	if (status < 0)

drivers/usb/gadget/cdc2.c

+5 −8
Original line number Diff line number Diff line
@@ -90,15 +90,12 @@ static const struct usb_descriptor_header *otg_desc[] = { 




/* 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,

	[USB_GADGET_MANUFACTURER_IDX].s = manufacturer,

	[USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC,

	[USB_GADGET_SERIAL_IDX].s = "",

	{  } /* end of list */

};
@@ -197,8 +194,8 @@ static int __init cdc_bind(struct usb_composite_dev *cdev) 
	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail1;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;

	device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;



	/* register our configuration */

	status = usb_add_config(cdev, &cdc_config_driver, cdc_do_config);

drivers/usb/gadget/ether.c

+5 −9
Original line number Diff line number Diff line
@@ -193,17 +193,13 @@ static const struct usb_descriptor_header *otg_desc[] = { 
	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 = PREFIX DRIVER_DESC,

	[USB_GADGET_MANUFACTURER_IDX].s = manufacturer,

	[USB_GADGET_PRODUCT_IDX].s = PREFIX DRIVER_DESC,

	[USB_GADGET_SERIAL_IDX].s = "",

	{  } /* end of list */

};
@@ -349,8 +345,8 @@ static int __init eth_bind(struct usb_composite_dev *cdev) 
	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;

	device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;



	/* register our configuration(s); RNDIS first, if it's used */

	if (has_rndis()) {

drivers/usb/gadget/g_ffs.c

+6 −2
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ static const struct usb_descriptor_header *gfs_otg_desc[] = { 


/* String IDs are assigned dynamically */

static struct usb_string gfs_strings[] = {

	[USB_GADGET_MANUFACTURER_IDX].s = "",

	[USB_GADGET_PRODUCT_IDX].s = "",

	[USB_GADGET_SERIAL_IDX].s = "",

#ifdef CONFIG_USB_FUNCTIONFS_RNDIS

	{ .s = "FunctionFS + RNDIS" },

#endif
@@ -369,9 +372,10 @@ static int gfs_bind(struct usb_composite_dev *cdev) 


	for (i = 0; i < ARRAY_SIZE(gfs_configurations); ++i) {

		struct gfs_configuration *c = gfs_configurations + i;

		int sid = USB_GADGET_FIRST_AVAIL_IDX + i;



		c->c.label			= gfs_strings[i].s;

		c->c.iConfiguration		= gfs_strings[i].id;

		c->c.label			= gfs_strings[sid].s;

		c->c.iConfiguration		= gfs_strings[sid].id;

		c->c.bConfigurationValue	= 1 + i;

		c->c.bmAttributes		= USB_CONFIG_ATT_SELFPOWER;