Commit 5d1f00a2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] sound: simplify au0828 quirk table 



Add a macro to simplify au0828 quirk table. That makes easier
to check it against the USB IDs at drivers/media/usb/au0828/au0828-cards.c.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 0d1165fc

drivers/media/usb/au0828/au0828-cards.c

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ static void hvr950q_cs5340_audio(void *priv, int enable) 
		au0828_clear(dev, REG_000, 0x10);

}



/*

 * WARNING: There's a quirks table at sound/usb/quirks-table.h

 * that should also be updated every time a new device with V4L2 support

 * is added here.

 */

struct au0828_board au0828_boards[] = {

	[AU0828_BOARD_UNKNOWN] = {

		.name	= "Unknown board",

sound/usb/quirks-table.h

+31 −127
Original line number Diff line number Diff line
@@ -2804,133 +2804,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
	}

},



/* Hauppauge HVR-950Q and HVR-850 */

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-850",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

	}

},

{

	USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008),

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |

		       USB_DEVICE_ID_MATCH_INT_CLASS |

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,

	.bInterfaceClass = USB_CLASS_AUDIO,

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,

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

		.vendor_name = "Hauppauge",

		.product_name = "HVR-950Q",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_ALIGN_TRANSFER,

/*

 * Auvitek au0828 devices with audio interface.

 * This should be kept in sync with drivers/media/usb/au0828/au0828-cards.c

 * Please notice that some drivers are DVB only, and don't need to be

 * here. That's the case, for example, of DVICO_FUSIONHDTV7.

 */



#define AU0828_DEVICE(vid, pid, vname, pname) { \

	USB_DEVICE_VENDOR_SPEC(vid, pid), \

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \

		       USB_DEVICE_ID_MATCH_INT_CLASS | \

		       USB_DEVICE_ID_MATCH_INT_SUBCLASS, \

	.bInterfaceClass = USB_CLASS_AUDIO, \

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \

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

		.vendor_name = vname, \

		.product_name = pname, \

		.ifnum = QUIRK_ANY_INTERFACE, \

		.type = QUIRK_AUDIO_ALIGN_TRANSFER, \

	} \

}

},



AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),

AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"),

AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"),



/* Digidesign Mbox */

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE