Commit 5436f59b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Move device rename and profile quirks to an internal table 

So far we've added the devices that need vendor/product string renames
or the profile setup into the standard quirk table in quirks-table.h.
This table is imported into the primary USB audio device entry, hence
it's all exported for the probing so that udev and co can take a look
at it.  OTOH, for renaming or profile setup, we don't need to expose
those explicit entries because the probe itself follows the standard
way.  That said, we're exposing unnecessarily too many entries.

This patch moves such internal quirk entries into the own table, and
reduces the exported device table size.  Along with the moving items,
re-arrange the entries in the proper order.

Link: https://lore.kernel.org/r/20200817082140.20232-2-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b90b925f

sound/usb/card.c

+124 −9
Original line number Diff line number Diff line
@@ -332,6 +332,106 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) 
	return 0;

}



/*

 * Profile name preset table

 */

struct usb_audio_device_name {

	u32 id;

	const char *vendor_name;

	const char *product_name;

	const char *profile_name;	/* override card->longname */

};



#define PROFILE_NAME(vid, pid, vendor, product, profile)	 \

	{ .id = USB_ID(vid, pid), .vendor_name = (vendor),	 \

	  .product_name = (product), .profile_name = (profile) }

#define DEVICE_NAME(vid, pid, vendor, product) \

	PROFILE_NAME(vid, pid, vendor, product, NULL)



/* vendor/product and profile name presets, sorted in device id order */

static const struct usb_audio_device_name usb_audio_names[] = {

	/* HP Thunderbolt Dock Audio Headset */

	PROFILE_NAME(0x03f0, 0x0269, "HP", "Thunderbolt Dock Audio Headset",

		     "HP-Thunderbolt-Dock-Audio-Headset"),

	/* HP Thunderbolt Dock Audio Module */

	PROFILE_NAME(0x03f0, 0x0567, "HP", "Thunderbolt Dock Audio Module",

		     "HP-Thunderbolt-Dock-Audio-Module"),



	/* Two entries for Gigabyte TRX40 Aorus Master:

	 * TRX40 Aorus Master has two USB-audio devices, one for the front

	 * headphone with ESS SABRE9218 DAC chip, while another for the rest

	 * I/O (the rear panel and the front mic) with Realtek ALC1220-VB.

	 * Here we provide two distinct names for making UCM profiles easier.

	 */

	PROFILE_NAME(0x0414, 0xa000, "Gigabyte", "Aorus Master Front Headphone",

		     "Gigabyte-Aorus-Master-Front-Headphone"),

	PROFILE_NAME(0x0414, 0xa001, "Gigabyte", "Aorus Master Main Audio",

		     "Gigabyte-Aorus-Master-Main-Audio"),



	/* Gigabyte TRX40 Aorus Pro WiFi */

	PROFILE_NAME(0x0414, 0xa002,

		     "Realtek", "ALC1220-VB-DT", "Realtek-ALC1220-VB-Desktop"),



	/* Creative/E-Mu devices */

	DEVICE_NAME(0x041e, 0x3010, "Creative Labs", "Sound Blaster MP3+"),

	/* Creative/Toshiba Multimedia Center SB-0500 */

	DEVICE_NAME(0x041e, 0x3048, "Toshiba", "SB-0500"),



	DEVICE_NAME(0x046d, 0x0990, "Logitech, Inc.", "QuickCam Pro 9000"),



	/* Dell WD15 Dock */

	PROFILE_NAME(0x0bda, 0x4014, "Dell", "WD15 Dock", "Dell-WD15-Dock"),

	/* Dell WD19 Dock */

	PROFILE_NAME(0x0bda, 0x402e, "Dell", "WD19 Dock", "Dell-WD15-Dock"),



	DEVICE_NAME(0x0ccd, 0x0028, "TerraTec", "Aureon5.1MkII"),



	/*

	 * The original product_name is "USB Sound Device", however this name

	 * is also used by the CM106 based cards, so make it unique.

	 */

	DEVICE_NAME(0x0d8c, 0x0102, NULL, "ICUSBAUDIO7D"),

	DEVICE_NAME(0x0d8c, 0x0103, NULL, "Audio Advantage MicroII"),



	/* MSI TRX40 Creator */

	PROFILE_NAME(0x0db0, 0x0d64,

		     "Realtek", "ALC1220-VB-DT", "Realtek-ALC1220-VB-Desktop"),

	/* MSI TRX40 */

	PROFILE_NAME(0x0db0, 0x543d,

		     "Realtek", "ALC1220-VB-DT", "Realtek-ALC1220-VB-Desktop"),



	/* Stanton/N2IT Final Scratch v1 device ('Scratchamp') */

	DEVICE_NAME(0x103d, 0x0100, "Stanton", "ScratchAmp"),

	DEVICE_NAME(0x103d, 0x0101, "Stanton", "ScratchAmp"),



	/* aka. Serato Scratch Live DJ Box */

	DEVICE_NAME(0x13e5, 0x0001, "Rane", "SL-1"),



	/* Lenovo ThinkStation P620 Rear Line-in, Line-out and Microphone */

	PROFILE_NAME(0x17aa, 0x1046, "Lenovo", "ThinkStation P620 Rear",

		     "Lenovo-ThinkStation-P620-Rear"),

	/* Lenovo ThinkStation P620 Internal Speaker + Front Headset */

	PROFILE_NAME(0x17aa, 0x104d, "Lenovo", "ThinkStation P620 Main",

		     "Lenovo-ThinkStation-P620-Main"),



	/* Asrock TRX40 Creator */

	PROFILE_NAME(0x26ce, 0x0a01,

		     "Realtek", "ALC1220-VB-DT", "Realtek-ALC1220-VB-Desktop"),



	{ } /* terminator */

};



static const struct usb_audio_device_name *

lookup_device_name(u32 id)

{

	static const struct usb_audio_device_name *p;



	for (p = usb_audio_names; p->id; p++)

		if (p->id == id)

			return p;

	return NULL;

}



/*

 * free the chip instance

 *
@@ -357,10 +457,16 @@ static void usb_audio_make_shortname(struct usb_device *dev, 
				     const struct snd_usb_audio_quirk *quirk)

{

	struct snd_card *card = chip->card;



	if (quirk && quirk->product_name && *quirk->product_name) {

		strlcpy(card->shortname, quirk->product_name,

			sizeof(card->shortname));

	const struct usb_audio_device_name *preset;

	const char *s = NULL;



	preset = lookup_device_name(chip->usb_id);

	if (preset && preset->product_name)

		s = preset->product_name;

	else if (quirk && quirk->product_name)

		s = quirk->product_name;

	if (s && *s) {

		strlcpy(card->shortname, s, sizeof(card->shortname));

		return;

	}
@@ -382,17 +488,26 @@ static void usb_audio_make_longname(struct usb_device *dev, 
				    const struct snd_usb_audio_quirk *quirk)

{

	struct snd_card *card = chip->card;

	const struct usb_audio_device_name *preset;

	const char *s = NULL;

	int len;



	preset = lookup_device_name(chip->usb_id);



	/* shortcut - if any pre-defined string is given, use it */

	if (quirk && quirk->profile_name && *quirk->profile_name) {

		strlcpy(card->longname, quirk->profile_name,

			sizeof(card->longname));

	if (preset && preset->profile_name)

		s = preset->profile_name;

	if (s && *s) {

		strlcpy(card->longname, s, sizeof(card->longname));

		return;

	}



	if (quirk && quirk->vendor_name && *quirk->vendor_name) {

		len = strlcpy(card->longname, quirk->vendor_name, sizeof(card->longname));

	if (preset && preset->vendor_name)

		s = preset->vendor_name;

	else if (quirk && quirk->vendor_name)

		s = quirk->vendor_name;

	if (s && *s) {

		len = strlcpy(card->longname, s, sizeof(card->longname));

	} else {

		/* retrieve the vendor and device strings as longname */

		if (dev->descriptor.iManufacturer)

sound/usb/quirks-table.h

+0 −120
Original line number Diff line number Diff line
@@ -25,33 +25,6 @@ 
	.idProduct = prod, \

	.bInterfaceClass = USB_CLASS_VENDOR_SPEC



#define QUIRK_RENAME_DEVICE(_vendor, _device)				\

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \

		.vendor_name = _vendor,					\

		.product_name = _device,				\

		.ifnum = QUIRK_NO_INTERFACE				\

	}



#define QUIRK_DEVICE_PROFILE(_vendor, _device, _profile)		\

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \

		.vendor_name = _vendor,					\

		.product_name = _device,				\

		.profile_name = _profile,				\

		.ifnum = QUIRK_NO_INTERFACE				\

	}



/* HP Thunderbolt Dock Audio Headset */

{

	USB_DEVICE(0x03f0, 0x0269),

	QUIRK_DEVICE_PROFILE("HP", "Thunderbolt Dock Audio Headset",

			     "HP-Thunderbolt-Dock-Audio-Headset"),

},

/* HP Thunderbolt Dock Audio Module */

{

	USB_DEVICE(0x03f0, 0x0567),

	QUIRK_DEVICE_PROFILE("HP", "Thunderbolt Dock Audio Module",

			     "HP-Thunderbolt-Dock-Audio-Module"),

},

/* FTDI devices */

{

	USB_DEVICE(0x0403, 0xb8d8),
@@ -85,16 +58,6 @@ 
	}

},



/* Creative/E-Mu devices */

{

	USB_DEVICE(0x041e, 0x3010),

	QUIRK_RENAME_DEVICE("Creative Labs", "Sound Blaster MP3+")

},

/* Creative/Toshiba Multimedia Center SB-0500 */

{

	USB_DEVICE(0x041e, 0x3048),

	QUIRK_RENAME_DEVICE("Toshiba", "SB-0500")

},

{

	/* E-Mu 0202 USB */

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE,
@@ -226,7 +189,6 @@ 
	.idProduct = 0x0990,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

	QUIRK_RENAME_DEVICE("Logitech, Inc.", "QuickCam Pro 9000")

},



/*
@@ -2609,10 +2571,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
		.type = QUIRK_MIDI_STANDARD_INTERFACE

	}

},

{

	USB_DEVICE(0x0ccd, 0x0028),

	QUIRK_RENAME_DEVICE("TerraTec", "Aureon5.1MkII")

},

{

	USB_DEVICE(0x0ccd, 0x0035),

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -2623,16 +2581,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
	}

},



/* Stanton/N2IT Final Scratch v1 device ('Scratchamp') */

{

	USB_DEVICE(0x103d, 0x0100),

	QUIRK_RENAME_DEVICE("Stanton", "ScratchAmp")

},

{

	USB_DEVICE(0x103d, 0x0101),

	QUIRK_RENAME_DEVICE("Stanton", "ScratchAmp")

},



/* Novation EMS devices */

{

	USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
@@ -2817,26 +2765,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
	}

},



/* */

{

	/* aka. Serato Scratch Live DJ Box */

	USB_DEVICE(0x13e5, 0x0001),

	QUIRK_RENAME_DEVICE("Rane", "SL-1")

},



/* Lenovo ThinkStation P620 Rear Line-in, Line-out and Microphone */

{

	USB_DEVICE(0x17aa, 0x1046),

	QUIRK_DEVICE_PROFILE("Lenovo", "ThinkStation P620 Rear",

			     "Lenovo-ThinkStation-P620-Rear"),

},

/* Lenovo ThinkStation P620 Internal Speaker + Front Headset */

{

	USB_DEVICE(0x17aa, 0x104d),

	QUIRK_DEVICE_PROFILE("Lenovo", "ThinkStation P620 Main",

			     "Lenovo-ThinkStation-P620-Main"),

},



/* Native Instruments MK2 series */

{

	/* Komplete Audio 6 */
@@ -3295,19 +3223,6 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 
	}

},



/*

 * The original product_name is "USB Sound Device", however this name

 * is also used by the CM106 based cards, so make it unique.

 */

{

	USB_DEVICE(0x0d8c, 0x0102),

	QUIRK_RENAME_DEVICE(NULL, "ICUSBAUDIO7D")

},

{

	USB_DEVICE(0x0d8c, 0x0103),

	QUIRK_RENAME_DEVICE(NULL, "Audio Advantage MicroII")

},



/* disabled due to regression for other devices;

 * see https://bugzilla.kernel.org/show_bug.cgi?id=199905

 */
@@ -3408,18 +3323,10 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 
		}

	}

},

/* Dell WD15 Dock */

{

	USB_DEVICE(0x0bda, 0x4014),

	QUIRK_DEVICE_PROFILE("Dell", "WD15 Dock", "Dell-WD15-Dock")

},

/* Dell WD19 Dock */

{

	USB_DEVICE(0x0bda, 0x402e),

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {

		.vendor_name = "Dell",

		.product_name = "WD19 Dock",

		.profile_name = "Dell-WD15-Dock",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_SETUP_FMT_AFTER_RESUME

	}
@@ -3645,33 +3552,6 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 
	}

},



#define ALC1220_VB_DESKTOP(vend, prod) { \

	USB_DEVICE(vend, prod),	\

	QUIRK_DEVICE_PROFILE("Realtek", "ALC1220-VB-DT", \

			     "Realtek-ALC1220-VB-Desktop") \

}

ALC1220_VB_DESKTOP(0x0414, 0xa002), /* Gigabyte TRX40 Aorus Pro WiFi */

ALC1220_VB_DESKTOP(0x0db0, 0x0d64), /* MSI TRX40 Creator */

ALC1220_VB_DESKTOP(0x0db0, 0x543d), /* MSI TRX40 */

ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */

#undef ALC1220_VB_DESKTOP



/* Two entries for Gigabyte TRX40 Aorus Master:

 * TRX40 Aorus Master has two USB-audio devices, one for the front headphone

 * with ESS SABRE9218 DAC chip, while another for the rest I/O (the rear

 * panel and the front mic) with Realtek ALC1220-VB.

 * Here we provide two distinct names for making UCM profiles easier.

 */

{

	USB_DEVICE(0x0414, 0xa000),

	QUIRK_DEVICE_PROFILE("Gigabyte", "Aorus Master Front Headphone",

			     "Gigabyte-Aorus-Master-Front-Headphone")

},

{

	USB_DEVICE(0x0414, 0xa001),

	QUIRK_DEVICE_PROFILE("Gigabyte", "Aorus Master Main Audio",

			     "Gigabyte-Aorus-Master-Main-Audio")

},

{

	/*

	 * Pioneer DJ DJM-900NXS2

sound/usb/usbaudio.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ enum quirk_type { 
struct snd_usb_audio_quirk {

	const char *vendor_name;

	const char *product_name;

	const char *profile_name;	/* override the card->longname */

	int16_t ifnum;

	uint16_t type;

	bool shares_media_device;

CRA Git | Maintained and supported by SUSTech CRA and CCSE