diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-30 06:53:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-30 07:23:57 -0400 |
commit | 5d1f00a20d2d56ed480e64e938a2391353ee565b (patch) | |
tree | 7ba4a7e756239a0008d9fb06180220cf223673e1 /sound/usb | |
parent | 0d1165fcafaf42b153857ba6e21200fdd8c9543a (diff) |
[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: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/quirks-table.h | 158 |
1 files changed, 31 insertions, 127 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index c657752a420c..8f3e2bf100eb 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h | |||
@@ -2804,133 +2804,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
2804 | } | 2804 | } |
2805 | }, | 2805 | }, |
2806 | 2806 | ||
2807 | /* Hauppauge HVR-950Q and HVR-850 */ | 2807 | /* |
2808 | { | 2808 | * Auvitek au0828 devices with audio interface. |
2809 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200), | 2809 | * This should be kept in sync with drivers/media/usb/au0828/au0828-cards.c |
2810 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | 2810 | * Please notice that some drivers are DVB only, and don't need to be |
2811 | USB_DEVICE_ID_MATCH_INT_CLASS | | 2811 | * here. That's the case, for example, of DVICO_FUSIONHDTV7. |
2812 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | 2812 | */ |
2813 | .bInterfaceClass = USB_CLASS_AUDIO, | 2813 | |
2814 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | 2814 | #define AU0828_DEVICE(vid, pid, vname, pname) { \ |
2815 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | 2815 | USB_DEVICE_VENDOR_SPEC(vid, pid), \ |
2816 | .vendor_name = "Hauppauge", | 2816 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ |
2817 | .product_name = "HVR-950Q", | 2817 | USB_DEVICE_ID_MATCH_INT_CLASS | \ |
2818 | .ifnum = QUIRK_ANY_INTERFACE, | 2818 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, \ |
2819 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | 2819 | .bInterfaceClass = USB_CLASS_AUDIO, \ |
2820 | } | 2820 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \ |
2821 | }, | 2821 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { \ |
2822 | { | 2822 | .vendor_name = vname, \ |
2823 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210), | 2823 | .product_name = pname, \ |
2824 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | 2824 | .ifnum = QUIRK_ANY_INTERFACE, \ |
2825 | USB_DEVICE_ID_MATCH_INT_CLASS | | 2825 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, \ |
2826 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | 2826 | } \ |
2827 | .bInterfaceClass = USB_CLASS_AUDIO, | 2827 | } |
2828 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | 2828 | |
2829 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | 2829 | AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"), |
2830 | .vendor_name = "Hauppauge", | 2830 | AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"), |
2831 | .product_name = "HVR-950Q", | 2831 | AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"), |
2832 | .ifnum = QUIRK_ANY_INTERFACE, | 2832 | AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"), |
2833 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | 2833 | AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"), |
2834 | } | 2834 | AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"), |
2835 | }, | 2835 | AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"), |
2836 | { | 2836 | AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"), |
2837 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217), | 2837 | AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"), |
2838 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2839 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2840 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2841 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2842 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2843 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2844 | .vendor_name = "Hauppauge", | ||
2845 | .product_name = "HVR-950Q", | ||
2846 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2847 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2848 | } | ||
2849 | }, | ||
2850 | { | ||
2851 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b), | ||
2852 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2853 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2854 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2855 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2856 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2857 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2858 | .vendor_name = "Hauppauge", | ||
2859 | .product_name = "HVR-950Q", | ||
2860 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2861 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2862 | } | ||
2863 | }, | ||
2864 | { | ||
2865 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e), | ||
2866 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2867 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2868 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2869 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2870 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2871 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2872 | .vendor_name = "Hauppauge", | ||
2873 | .product_name = "HVR-950Q", | ||
2874 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2875 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2876 | } | ||
2877 | }, | ||
2878 | { | ||
2879 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f), | ||
2880 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2881 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2882 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2883 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2884 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2885 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2886 | .vendor_name = "Hauppauge", | ||
2887 | .product_name = "HVR-950Q", | ||
2888 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2889 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2890 | } | ||
2891 | }, | ||
2892 | { | ||
2893 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240), | ||
2894 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2895 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2896 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2897 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2898 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2899 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2900 | .vendor_name = "Hauppauge", | ||
2901 | .product_name = "HVR-850", | ||
2902 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2903 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2904 | } | ||
2905 | }, | ||
2906 | { | ||
2907 | USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280), | ||
2908 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2909 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2910 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2911 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2912 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2913 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2914 | .vendor_name = "Hauppauge", | ||
2915 | .product_name = "HVR-950Q", | ||
2916 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2917 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2918 | } | ||
2919 | }, | ||
2920 | { | ||
2921 | USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008), | ||
2922 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
2923 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
2924 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
2925 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
2926 | .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, | ||
2927 | .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { | ||
2928 | .vendor_name = "Hauppauge", | ||
2929 | .product_name = "HVR-950Q", | ||
2930 | .ifnum = QUIRK_ANY_INTERFACE, | ||
2931 | .type = QUIRK_AUDIO_ALIGN_TRANSFER, | ||
2932 | } | ||
2933 | }, | ||
2934 | 2838 | ||
2935 | /* Digidesign Mbox */ | 2839 | /* Digidesign Mbox */ |
2936 | { | 2840 | { |