tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

media: dvb-usb: dib0700_devices: use an enum for the device number

The device number is currently a value that needs to be the same
on two separate tables, but the code doesn't actually enforce it,
leading to errors as boards get added or removed.

Fix it by using an enum.

Link: https://lore.kernel.org/linux-media/028699ec71158dbc49d710a4259eb8cdb7f673cb.1648499509.git.mchehab@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

Mauro Carvalho Chehab 3d59142a 281b21c5

+269 -178
+259 -171
drivers/media/usb/dvb-usb/dib0700_devices.c
··· 3816 3816 3817 3817 3818 3818 /* DVB-USB and USB stuff follows */ 3819 - struct usb_device_id dib0700_usb_id_table[] = { 3820 - /* 0 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) }, 3821 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P_PC) }, 3822 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) }, 3823 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) }, 3824 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) }, 3825 - /* 5 */ { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) }, 3826 - { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500) }, 3827 - { USB_DEVICE(USB_VID_UNIWILL, USB_PID_UNIWILL_STK7700P) }, 3828 - { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_STK7700P) }, 3829 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_2) }, 3830 - /* 10 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_2) }, 3831 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV2000E) }, 3832 - { USB_DEVICE(USB_VID_TERRATEC, 3833 - USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY) }, 3834 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK) }, 3835 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700D) }, 3836 - /* 15 */{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7070P) }, 3837 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV_DVB_T_FLASH) }, 3838 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7070PD) }, 3839 - { USB_DEVICE(USB_VID_PINNACLE, 3840 - USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T) }, 3841 - { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500_PC) }, 3842 - /* 20 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_EXPRESS) }, 3843 - { USB_DEVICE(USB_VID_GIGABYTE, USB_PID_GIGABYTE_U7000) }, 3844 - { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) }, 3845 - { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) }, 3846 - { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) }, 3847 - /* 25 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) }, 3848 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MYTV_T) }, 3849 - { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_USB_XE) }, 3850 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_EXPRESSCARD_320CX) }, 3851 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV72E) }, 3852 - /* 30 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73E) }, 3853 - { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_EC372S) }, 3854 - { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_EXPRESS) }, 3855 - { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS) }, 3856 - { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) }, 3857 - /* 35 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) }, 3858 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_3) }, 3859 - { USB_DEVICE(USB_VID_GIGABYTE, USB_PID_GIGABYTE_U8000) }, 3860 - { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700PH) }, 3861 - { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) }, 3862 - /* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) }, 3863 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) }, 3864 - { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_EXPRESS) }, 3865 - { USB_DEVICE(USB_VID_TERRATEC, 3866 - USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2) }, 3867 - { USB_DEVICE(USB_VID_SONY, USB_PID_SONY_PLAYTV) }, 3868 - /* 45 */{ USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_PD378S) }, 3869 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_TIGER_ATSC) }, 3870 - { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_TIGER_ATSC_B210) }, 3871 - { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_MC770) }, 3872 - { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT) }, 3873 - /* 50 */{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT_Dlx) }, 3874 - { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_H) }, 3875 - { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_T3) }, 3876 - { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_T5) }, 3877 - { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700D) }, 3878 - /* 55 */{ USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700D_2) }, 3879 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73A) }, 3880 - { USB_DEVICE(USB_VID_PCTV, USB_PID_PINNACLE_PCTV73ESE) }, 3881 - { USB_DEVICE(USB_VID_PCTV, USB_PID_PINNACLE_PCTV282E) }, 3882 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7770P) }, 3883 - /* 60 */{ USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS_2) }, 3884 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XPVR) }, 3885 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XP) }, 3886 - { USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x000, 0x3f00) }, 3887 - { USB_DEVICE(USB_VID_EVOLUTEPC, USB_PID_TVWAY_PLUS) }, 3888 - /* 65 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) }, 3889 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV282E) }, 3890 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK8096GP) }, 3891 - { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DIVERSITY) }, 3892 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM9090M) }, 3893 - /* 70 */{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM8096MD) }, 3894 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM9090MD) }, 3895 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM7090) }, 3896 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7090PVR) }, 3897 - { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) }, 3898 - /* 75 */{ USB_DEVICE(USB_VID_MEDION, USB_PID_CREATIX_CTX1921) }, 3899 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV340E) }, 3900 - { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV340E_SE) }, 3901 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7790P) }, 3902 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE8096P) }, 3903 - /* 80 */{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT_2) }, 3904 - { USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_2002E) }, 3905 - { USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_2002E_SE) }, 3906 - { USB_DEVICE(USB_VID_PCTV, USB_PID_DIBCOM_STK8096PVR) }, 3907 - { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK8096PVR) }, 3908 - /* 85 */{ USB_DEVICE(USB_VID_HAMA, USB_PID_HAMA_DVBT_HYBRID) }, 3909 - { USB_DEVICE(USB_VID_MICROSOFT, USB_PID_XBOX_ONE_TUNER) }, 3910 - { 0 } /* Terminating entry */ 3819 + enum { 3820 + DIBCOM_STK7700P, 3821 + DIBCOM_STK7700P_PC, 3822 + HAUPPAUGE_NOVA_T_500, 3823 + HAUPPAUGE_NOVA_T_500_2, 3824 + HAUPPAUGE_NOVA_T_STICK, 3825 + AVERMEDIA_VOLAR, 3826 + COMPRO_VIDEOMATE_U500, 3827 + UNIWILL_STK7700P, 3828 + LEADTEK_WINFAST_DTV_DONGLE_STK7700P, 3829 + HAUPPAUGE_NOVA_T_STICK_2, 3830 + AVERMEDIA_VOLAR_2, 3831 + PINNACLE_PCTV2000E, 3832 + TERRATEC_CINERGY_DT_XS_DIVERSITY, 3833 + HAUPPAUGE_NOVA_TD_STICK, 3834 + DIBCOM_STK7700D, 3835 + DIBCOM_STK7070P, 3836 + PINNACLE_PCTV_DVB_T_FLASH, 3837 + DIBCOM_STK7070PD, 3838 + PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T, 3839 + COMPRO_VIDEOMATE_U500_PC, 3840 + AVERMEDIA_EXPRESS, 3841 + GIGABYTE_U7000, 3842 + ULTIMA_ARTEC_T14BR, 3843 + ASUS_U3000, 3844 + ASUS_U3100, 3845 + HAUPPAUGE_NOVA_T_STICK_3, 3846 + HAUPPAUGE_MYTV_T, 3847 + TERRATEC_CINERGY_HT_USB_XE, 3848 + PINNACLE_EXPRESSCARD_320CX, 3849 + PINNACLE_PCTV72E, 3850 + PINNACLE_PCTV73E, 3851 + YUAN_EC372S, 3852 + TERRATEC_CINERGY_HT_EXPRESS, 3853 + TERRATEC_CINERGY_T_XXS, 3854 + LEADTEK_WINFAST_DTV_DONGLE_STK7700P_2, 3855 + HAUPPAUGE_NOVA_TD_STICK_52009, 3856 + HAUPPAUGE_NOVA_T_500_3, 3857 + GIGABYTE_U8000, 3858 + YUAN_STK7700PH, 3859 + ASUS_U3000H, 3860 + PINNACLE_PCTV801E, 3861 + PINNACLE_PCTV801E_SE, 3862 + TERRATEC_CINERGY_T_EXPRESS, 3863 + TERRATEC_CINERGY_DT_XS_DIVERSITY_2, 3864 + SONY_PLAYTV, 3865 + YUAN_PD378S, 3866 + HAUPPAUGE_TIGER_ATSC, 3867 + HAUPPAUGE_TIGER_ATSC_B210, 3868 + YUAN_MC770, 3869 + ELGATO_EYETV_DTT, 3870 + ELGATO_EYETV_DTT_Dlx, 3871 + LEADTEK_WINFAST_DTV_DONGLE_H, 3872 + TERRATEC_T3, 3873 + TERRATEC_T5, 3874 + YUAN_STK7700D, 3875 + YUAN_STK7700D_2, 3876 + PINNACLE_PCTV73A, 3877 + PCTV_PINNACLE_PCTV73ESE, 3878 + PCTV_PINNACLE_PCTV282E, 3879 + DIBCOM_STK7770P, 3880 + TERRATEC_CINERGY_T_XXS_2, 3881 + DIBCOM_STK807XPVR, 3882 + DIBCOM_STK807XP, 3883 + PIXELVIEW_SBTVD, 3884 + EVOLUTEPC_TVWAY_PLUS, 3885 + PINNACLE_PCTV73ESE, 3886 + PINNACLE_PCTV282E, 3887 + DIBCOM_STK8096GP, 3888 + ELGATO_EYETV_DIVERSITY, 3889 + DIBCOM_NIM9090M, 3890 + DIBCOM_NIM8096MD, 3891 + DIBCOM_NIM9090MD, 3892 + DIBCOM_NIM7090, 3893 + DIBCOM_TFE7090PVR, 3894 + TECHNISAT_AIRSTAR_TELESTICK_2, 3895 + MEDION_CREATIX_CTX1921, 3896 + PINNACLE_PCTV340E, 3897 + PINNACLE_PCTV340E_SE, 3898 + DIBCOM_TFE7790P, 3899 + DIBCOM_TFE8096P, 3900 + ELGATO_EYETV_DTT_2, 3901 + PCTV_2002E, 3902 + PCTV_2002E_SE, 3903 + PCTV_DIBCOM_STK8096PVR, 3904 + DIBCOM_STK8096PVR, 3905 + HAMA_DVBT_HYBRID, 3906 + MICROSOFT_XBOX_ONE_TUNER, 3911 3907 }; 3908 + 3909 + struct usb_device_id dib0700_usb_id_table[] = { 3910 + DVB_USB_DEV(DIBCOM, DIBCOM_STK7700P), 3911 + DVB_USB_DEV(DIBCOM, DIBCOM_STK7700P_PC), 3912 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_T_500), 3913 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_T_500_2), 3914 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_T_STICK), 3915 + DVB_USB_DEV(AVERMEDIA, AVERMEDIA_VOLAR), 3916 + DVB_USB_DEV(COMPRO, COMPRO_VIDEOMATE_U500), 3917 + DVB_USB_DEV(UNIWILL, UNIWILL_STK7700P), 3918 + DVB_USB_DEV(LEADTEK, LEADTEK_WINFAST_DTV_DONGLE_STK7700P), 3919 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_T_STICK_2), 3920 + DVB_USB_DEV(AVERMEDIA, AVERMEDIA_VOLAR_2), 3921 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV2000E), 3922 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_DT_XS_DIVERSITY), 3923 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_TD_STICK), 3924 + DVB_USB_DEV(DIBCOM, DIBCOM_STK7700D), 3925 + DVB_USB_DEV(DIBCOM, DIBCOM_STK7070P), 3926 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_DVB_T_FLASH), 3927 + DVB_USB_DEV(DIBCOM, DIBCOM_STK7070PD), 3928 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T), 3929 + DVB_USB_DEV(COMPRO, COMPRO_VIDEOMATE_U500_PC), 3930 + DVB_USB_DEV(AVERMEDIA, AVERMEDIA_EXPRESS), 3931 + DVB_USB_DEV(GIGABYTE, GIGABYTE_U7000), 3932 + DVB_USB_DEV(ULTIMA_ELECTRONIC, ULTIMA_ARTEC_T14BR), 3933 + DVB_USB_DEV(ASUS, ASUS_U3000), 3934 + DVB_USB_DEV(ASUS, ASUS_U3100), 3935 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_T_STICK_3), 3936 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_MYTV_T), 3937 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_HT_USB_XE), 3938 + DVB_USB_DEV(PINNACLE, PINNACLE_EXPRESSCARD_320CX), 3939 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV72E), 3940 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV73E), 3941 + DVB_USB_DEV(YUAN, YUAN_EC372S), 3942 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_HT_EXPRESS), 3943 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T_XXS), 3944 + DVB_USB_DEV(LEADTEK, LEADTEK_WINFAST_DTV_DONGLE_STK7700P_2), 3945 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_TD_STICK_52009), 3946 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_NOVA_T_500_3), 3947 + DVB_USB_DEV(GIGABYTE, GIGABYTE_U8000), 3948 + DVB_USB_DEV(YUAN, YUAN_STK7700PH), 3949 + DVB_USB_DEV(ASUS, ASUS_U3000H), 3950 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV801E), 3951 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV801E_SE), 3952 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T_EXPRESS), 3953 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_DT_XS_DIVERSITY_2), 3954 + DVB_USB_DEV(SONY, SONY_PLAYTV), 3955 + DVB_USB_DEV(YUAN, YUAN_PD378S), 3956 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_TIGER_ATSC), 3957 + DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_TIGER_ATSC_B210), 3958 + DVB_USB_DEV(YUAN, YUAN_MC770), 3959 + DVB_USB_DEV(ELGATO, ELGATO_EYETV_DTT), 3960 + DVB_USB_DEV(ELGATO, ELGATO_EYETV_DTT_Dlx), 3961 + DVB_USB_DEV(LEADTEK, LEADTEK_WINFAST_DTV_DONGLE_H), 3962 + DVB_USB_DEV(TERRATEC, TERRATEC_T3), 3963 + DVB_USB_DEV(TERRATEC, TERRATEC_T5), 3964 + DVB_USB_DEV(YUAN, YUAN_STK7700D), 3965 + DVB_USB_DEV(YUAN, YUAN_STK7700D_2), 3966 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV73A), 3967 + DVB_USB_DEV(PCTV, PCTV_PINNACLE_PCTV73ESE), 3968 + DVB_USB_DEV(PCTV, PCTV_PINNACLE_PCTV282E), 3969 + DVB_USB_DEV(DIBCOM, DIBCOM_STK7770P), 3970 + DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T_XXS_2), 3971 + DVB_USB_DEV(DIBCOM, DIBCOM_STK807XPVR), 3972 + DVB_USB_DEV(DIBCOM, DIBCOM_STK807XP), 3973 + DVB_USB_DEV_VER(PIXELVIEW, PIXELVIEW_SBTVD, 0x000, 0x3f00), 3974 + DVB_USB_DEV(EVOLUTEPC, EVOLUTEPC_TVWAY_PLUS), 3975 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV73ESE), 3976 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV282E), 3977 + DVB_USB_DEV(DIBCOM, DIBCOM_STK8096GP), 3978 + DVB_USB_DEV(ELGATO, ELGATO_EYETV_DIVERSITY), 3979 + DVB_USB_DEV(DIBCOM, DIBCOM_NIM9090M), 3980 + DVB_USB_DEV(DIBCOM, DIBCOM_NIM8096MD), 3981 + DVB_USB_DEV(DIBCOM, DIBCOM_NIM9090MD), 3982 + DVB_USB_DEV(DIBCOM, DIBCOM_NIM7090), 3983 + DVB_USB_DEV(DIBCOM, DIBCOM_TFE7090PVR), 3984 + DVB_USB_DEV(TECHNISAT, TECHNISAT_AIRSTAR_TELESTICK_2), 3985 + DVB_USB_DEV(MEDION, MEDION_CREATIX_CTX1921), 3986 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV340E), 3987 + DVB_USB_DEV(PINNACLE, PINNACLE_PCTV340E_SE), 3988 + DVB_USB_DEV(DIBCOM, DIBCOM_TFE7790P), 3989 + DVB_USB_DEV(DIBCOM, DIBCOM_TFE8096P), 3990 + DVB_USB_DEV(ELGATO, ELGATO_EYETV_DTT_2), 3991 + DVB_USB_DEV(PCTV, PCTV_2002E), 3992 + DVB_USB_DEV(PCTV, PCTV_2002E_SE), 3993 + DVB_USB_DEV(PCTV, PCTV_DIBCOM_STK8096PVR), 3994 + DVB_USB_DEV(DIBCOM, DIBCOM_STK8096PVR), 3995 + DVB_USB_DEV(HAMA, HAMA_DVBT_HYBRID), 3996 + DVB_USB_DEV(MICROSOFT, MICROSOFT_XBOX_ONE_TUNER), 3997 + { } 3998 + }; 3999 + 3912 4000 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 3913 4001 3914 4002 #define DIB0700_DEFAULT_DEVICE_PROPERTIES \ ··· 4050 3962 .num_device_descs = 8, 4051 3963 .devices = { 4052 3964 { "DiBcom STK7700P reference design", 4053 - { &dib0700_usb_id_table[0], &dib0700_usb_id_table[1] }, 3965 + { &dib0700_usb_id_table[DIBCOM_STK7700P], &dib0700_usb_id_table[DIBCOM_STK7700P_PC] }, 4054 3966 { NULL }, 4055 3967 }, 4056 3968 { "Hauppauge Nova-T Stick", 4057 - { &dib0700_usb_id_table[4], &dib0700_usb_id_table[9], NULL }, 3969 + { &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_STICK], &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_STICK_2], NULL }, 4058 3970 { NULL }, 4059 3971 }, 4060 3972 { "AVerMedia AVerTV DVB-T Volar", 4061 - { &dib0700_usb_id_table[5], &dib0700_usb_id_table[10] }, 3973 + { &dib0700_usb_id_table[AVERMEDIA_VOLAR], &dib0700_usb_id_table[AVERMEDIA_VOLAR_2] }, 4062 3974 { NULL }, 4063 3975 }, 4064 3976 { "Compro Videomate U500", 4065 - { &dib0700_usb_id_table[6], &dib0700_usb_id_table[19] }, 3977 + { &dib0700_usb_id_table[COMPRO_VIDEOMATE_U500], &dib0700_usb_id_table[COMPRO_VIDEOMATE_U500_PC] }, 4066 3978 { NULL }, 4067 3979 }, 4068 3980 { "Uniwill STK7700P based (Hama and others)", 4069 - { &dib0700_usb_id_table[7], NULL }, 3981 + { &dib0700_usb_id_table[UNIWILL_STK7700P], NULL }, 4070 3982 { NULL }, 4071 3983 }, 4072 3984 { "Leadtek Winfast DTV Dongle (STK7700P based)", 4073 - { &dib0700_usb_id_table[8], &dib0700_usb_id_table[34] }, 3985 + { &dib0700_usb_id_table[LEADTEK_WINFAST_DTV_DONGLE_STK7700P], &dib0700_usb_id_table[LEADTEK_WINFAST_DTV_DONGLE_STK7700P_2] }, 4074 3986 { NULL }, 4075 3987 }, 4076 3988 { "AVerMedia AVerTV DVB-T Express", 4077 - { &dib0700_usb_id_table[20] }, 3989 + { &dib0700_usb_id_table[AVERMEDIA_EXPRESS] }, 4078 3990 { NULL }, 4079 3991 }, 4080 3992 { "Gigabyte U7000", 4081 - { &dib0700_usb_id_table[21], NULL }, 3993 + { &dib0700_usb_id_table[GIGABYTE_U7000], NULL }, 4082 3994 { NULL }, 4083 3995 } 4084 3996 }, ··· 4118 4030 .num_device_descs = 1, 4119 4031 .devices = { 4120 4032 { "Hauppauge Nova-T 500 Dual DVB-T", 4121 - { &dib0700_usb_id_table[2], &dib0700_usb_id_table[3], NULL }, 4033 + { &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_500], &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_500_2], NULL }, 4122 4034 { NULL }, 4123 4035 }, 4124 4036 }, ··· 4166 4078 .num_device_descs = 5, 4167 4079 .devices = { 4168 4080 { "Pinnacle PCTV 2000e", 4169 - { &dib0700_usb_id_table[11], NULL }, 4081 + { &dib0700_usb_id_table[PINNACLE_PCTV2000E], NULL }, 4170 4082 { NULL }, 4171 4083 }, 4172 4084 { "Terratec Cinergy DT XS Diversity", 4173 - { &dib0700_usb_id_table[12], NULL }, 4085 + { &dib0700_usb_id_table[TERRATEC_CINERGY_DT_XS_DIVERSITY], NULL }, 4174 4086 { NULL }, 4175 4087 }, 4176 4088 { "Hauppauge Nova-TD Stick/Elgato Eye-TV Diversity", 4177 - { &dib0700_usb_id_table[13], NULL }, 4089 + { &dib0700_usb_id_table[HAUPPAUGE_NOVA_TD_STICK], NULL }, 4178 4090 { NULL }, 4179 4091 }, 4180 4092 { "DiBcom STK7700D reference design", 4181 - { &dib0700_usb_id_table[14], NULL }, 4093 + { &dib0700_usb_id_table[DIBCOM_STK7700D], NULL }, 4182 4094 { NULL }, 4183 4095 }, 4184 4096 { "YUAN High-Tech DiBcom STK7700D", 4185 - { &dib0700_usb_id_table[55], NULL }, 4097 + { &dib0700_usb_id_table[YUAN_STK7700D_2], NULL }, 4186 4098 { NULL }, 4187 4099 }, 4188 4100 ··· 4219 4131 .num_device_descs = 3, 4220 4132 .devices = { 4221 4133 { "ASUS My Cinema U3000 Mini DVBT Tuner", 4222 - { &dib0700_usb_id_table[23], NULL }, 4134 + { &dib0700_usb_id_table[ASUS_U3000], NULL }, 4223 4135 { NULL }, 4224 4136 }, 4225 4137 { "Yuan EC372S", 4226 - { &dib0700_usb_id_table[31], NULL }, 4138 + { &dib0700_usb_id_table[YUAN_EC372S], NULL }, 4227 4139 { NULL }, 4228 4140 }, 4229 4141 { "Terratec Cinergy T Express", 4230 - { &dib0700_usb_id_table[42], NULL }, 4142 + { &dib0700_usb_id_table[TERRATEC_CINERGY_T_EXPRESS], NULL }, 4231 4143 { NULL }, 4232 4144 } 4233 4145 }, ··· 4264 4176 .num_device_descs = 12, 4265 4177 .devices = { 4266 4178 { "DiBcom STK7070P reference design", 4267 - { &dib0700_usb_id_table[15], NULL }, 4179 + { &dib0700_usb_id_table[DIBCOM_STK7070P], NULL }, 4268 4180 { NULL }, 4269 4181 }, 4270 4182 { "Pinnacle PCTV DVB-T Flash Stick", 4271 - { &dib0700_usb_id_table[16], NULL }, 4183 + { &dib0700_usb_id_table[PINNACLE_PCTV_DVB_T_FLASH], NULL }, 4272 4184 { NULL }, 4273 4185 }, 4274 4186 { "Artec T14BR DVB-T", 4275 - { &dib0700_usb_id_table[22], NULL }, 4187 + { &dib0700_usb_id_table[ULTIMA_ARTEC_T14BR], NULL }, 4276 4188 { NULL }, 4277 4189 }, 4278 4190 { "ASUS My Cinema U3100 Mini DVBT Tuner", 4279 - { &dib0700_usb_id_table[24], NULL }, 4191 + { &dib0700_usb_id_table[ASUS_U3100], NULL }, 4280 4192 { NULL }, 4281 4193 }, 4282 4194 { "Hauppauge Nova-T Stick", 4283 - { &dib0700_usb_id_table[25], NULL }, 4195 + { &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_STICK_3], NULL }, 4284 4196 { NULL }, 4285 4197 }, 4286 4198 { "Hauppauge Nova-T MyTV.t", 4287 - { &dib0700_usb_id_table[26], NULL }, 4199 + { &dib0700_usb_id_table[HAUPPAUGE_MYTV_T], NULL }, 4288 4200 { NULL }, 4289 4201 }, 4290 4202 { "Pinnacle PCTV 72e", 4291 - { &dib0700_usb_id_table[29], NULL }, 4203 + { &dib0700_usb_id_table[PINNACLE_PCTV72E], NULL }, 4292 4204 { NULL }, 4293 4205 }, 4294 4206 { "Pinnacle PCTV 73e", 4295 - { &dib0700_usb_id_table[30], NULL }, 4207 + { &dib0700_usb_id_table[PINNACLE_PCTV73E], NULL }, 4296 4208 { NULL }, 4297 4209 }, 4298 4210 { "Elgato EyeTV DTT", 4299 - { &dib0700_usb_id_table[49], NULL }, 4211 + { &dib0700_usb_id_table[ELGATO_EYETV_DTT], NULL }, 4300 4212 { NULL }, 4301 4213 }, 4302 4214 { "Yuan PD378S", 4303 - { &dib0700_usb_id_table[45], NULL }, 4215 + { &dib0700_usb_id_table[YUAN_PD378S], NULL }, 4304 4216 { NULL }, 4305 4217 }, 4306 4218 { "Elgato EyeTV Dtt Dlx PD378S", 4307 - { &dib0700_usb_id_table[50], NULL }, 4219 + { &dib0700_usb_id_table[ELGATO_EYETV_DTT_Dlx], NULL }, 4308 4220 { NULL }, 4309 4221 }, 4310 4222 { "Elgato EyeTV DTT rev. 2", 4311 - { &dib0700_usb_id_table[80], NULL }, 4223 + { &dib0700_usb_id_table[ELGATO_EYETV_DTT_2], NULL }, 4312 4224 { NULL }, 4313 4225 }, 4314 4226 }, ··· 4345 4257 .num_device_descs = 3, 4346 4258 .devices = { 4347 4259 { "Pinnacle PCTV 73A", 4348 - { &dib0700_usb_id_table[56], NULL }, 4260 + { &dib0700_usb_id_table[PINNACLE_PCTV73A], NULL }, 4349 4261 { NULL }, 4350 4262 }, 4351 4263 { "Pinnacle PCTV 73e SE", 4352 - { &dib0700_usb_id_table[57], &dib0700_usb_id_table[65], NULL }, 4264 + { &dib0700_usb_id_table[PCTV_PINNACLE_PCTV73ESE], &dib0700_usb_id_table[PINNACLE_PCTV73ESE], NULL }, 4353 4265 { NULL }, 4354 4266 }, 4355 4267 { "Pinnacle PCTV 282e", 4356 - { &dib0700_usb_id_table[58], &dib0700_usb_id_table[66], NULL }, 4268 + { &dib0700_usb_id_table[PCTV_PINNACLE_PCTV282E], &dib0700_usb_id_table[PINNACLE_PCTV282E], NULL }, 4357 4269 { NULL }, 4358 4270 }, 4359 4271 }, ··· 4402 4314 .num_device_descs = 3, 4403 4315 .devices = { 4404 4316 { "Hauppauge Nova-TD Stick (52009)", 4405 - { &dib0700_usb_id_table[35], NULL }, 4317 + { &dib0700_usb_id_table[HAUPPAUGE_NOVA_TD_STICK_52009], NULL }, 4406 4318 { NULL }, 4407 4319 }, 4408 4320 { "PCTV 2002e", 4409 - { &dib0700_usb_id_table[81], NULL }, 4321 + { &dib0700_usb_id_table[PCTV_2002E], NULL }, 4410 4322 { NULL }, 4411 4323 }, 4412 4324 { "PCTV 2002e SE", 4413 - { &dib0700_usb_id_table[82], NULL }, 4325 + { &dib0700_usb_id_table[PCTV_2002E_SE], NULL }, 4414 4326 { NULL }, 4415 4327 }, 4416 4328 }, ··· 4459 4371 .num_device_descs = 5, 4460 4372 .devices = { 4461 4373 { "DiBcom STK7070PD reference design", 4462 - { &dib0700_usb_id_table[17], NULL }, 4374 + { &dib0700_usb_id_table[DIBCOM_STK7070PD], NULL }, 4463 4375 { NULL }, 4464 4376 }, 4465 4377 { "Pinnacle PCTV Dual DVB-T Diversity Stick", 4466 - { &dib0700_usb_id_table[18], NULL }, 4378 + { &dib0700_usb_id_table[PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T], NULL }, 4467 4379 { NULL }, 4468 4380 }, 4469 4381 { "Hauppauge Nova-TD-500 (84xxx)", 4470 - { &dib0700_usb_id_table[36], NULL }, 4382 + { &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_500_3], NULL }, 4471 4383 { NULL }, 4472 4384 }, 4473 4385 { "Terratec Cinergy DT USB XS Diversity/ T5", 4474 - { &dib0700_usb_id_table[43], 4475 - &dib0700_usb_id_table[53], NULL}, 4386 + { &dib0700_usb_id_table[TERRATEC_CINERGY_DT_XS_DIVERSITY_2], 4387 + &dib0700_usb_id_table[TERRATEC_T5], NULL}, 4476 4388 { NULL }, 4477 4389 }, 4478 4390 { "Sony PlayTV", 4479 - { &dib0700_usb_id_table[44], NULL }, 4391 + { &dib0700_usb_id_table[SONY_PLAYTV], NULL }, 4480 4392 { NULL }, 4481 4393 }, 4482 4394 }, ··· 4525 4437 .num_device_descs = 1, 4526 4438 .devices = { 4527 4439 { "Elgato EyeTV Diversity", 4528 - { &dib0700_usb_id_table[68], NULL }, 4440 + { &dib0700_usb_id_table[ELGATO_EYETV_DIVERSITY], NULL }, 4529 4441 { NULL }, 4530 4442 }, 4531 4443 }, ··· 4562 4474 .num_device_descs = 10, 4563 4475 .devices = { 4564 4476 { "Terratec Cinergy HT USB XE", 4565 - { &dib0700_usb_id_table[27], NULL }, 4477 + { &dib0700_usb_id_table[TERRATEC_CINERGY_HT_USB_XE], NULL }, 4566 4478 { NULL }, 4567 4479 }, 4568 4480 { "Pinnacle Expresscard 320cx", 4569 - { &dib0700_usb_id_table[28], NULL }, 4481 + { &dib0700_usb_id_table[PINNACLE_EXPRESSCARD_320CX], NULL }, 4570 4482 { NULL }, 4571 4483 }, 4572 4484 { "Terratec Cinergy HT Express", 4573 - { &dib0700_usb_id_table[32], NULL }, 4485 + { &dib0700_usb_id_table[TERRATEC_CINERGY_HT_EXPRESS], NULL }, 4574 4486 { NULL }, 4575 4487 }, 4576 4488 { "Gigabyte U8000-RH", 4577 - { &dib0700_usb_id_table[37], NULL }, 4489 + { &dib0700_usb_id_table[GIGABYTE_U8000], NULL }, 4578 4490 { NULL }, 4579 4491 }, 4580 4492 { "YUAN High-Tech STK7700PH", 4581 - { &dib0700_usb_id_table[38], NULL }, 4493 + { &dib0700_usb_id_table[YUAN_STK7700PH], NULL }, 4582 4494 { NULL }, 4583 4495 }, 4584 4496 { "Asus My Cinema-U3000Hybrid", 4585 - { &dib0700_usb_id_table[39], NULL }, 4497 + { &dib0700_usb_id_table[ASUS_U3000H], NULL }, 4586 4498 { NULL }, 4587 4499 }, 4588 4500 { "YUAN High-Tech MC770", 4589 - { &dib0700_usb_id_table[48], NULL }, 4501 + { &dib0700_usb_id_table[YUAN_MC770], NULL }, 4590 4502 { NULL }, 4591 4503 }, 4592 4504 { "Leadtek WinFast DTV Dongle H", 4593 - { &dib0700_usb_id_table[51], NULL }, 4505 + { &dib0700_usb_id_table[LEADTEK_WINFAST_DTV_DONGLE_H], NULL }, 4594 4506 { NULL }, 4595 4507 }, 4596 4508 { "YUAN High-Tech STK7700D", 4597 - { &dib0700_usb_id_table[54], NULL }, 4509 + { &dib0700_usb_id_table[YUAN_STK7700D], NULL }, 4598 4510 { NULL }, 4599 4511 }, 4600 4512 { "Hama DVB=T Hybrid USB Stick", 4601 - { &dib0700_usb_id_table[85], NULL }, 4513 + { &dib0700_usb_id_table[HAMA_DVBT_HYBRID], NULL }, 4602 4514 { NULL }, 4603 4515 }, 4604 4516 }, ··· 4630 4542 .num_device_descs = 2, 4631 4543 .devices = { 4632 4544 { "Pinnacle PCTV HD Pro USB Stick", 4633 - { &dib0700_usb_id_table[40], NULL }, 4545 + { &dib0700_usb_id_table[PINNACLE_PCTV801E], NULL }, 4634 4546 { NULL }, 4635 4547 }, 4636 4548 { "Pinnacle PCTV HD USB Stick", 4637 - { &dib0700_usb_id_table[41], NULL }, 4549 + { &dib0700_usb_id_table[PINNACLE_PCTV801E_SE], NULL }, 4638 4550 { NULL }, 4639 4551 }, 4640 4552 }, ··· 4666 4578 .num_device_descs = 2, 4667 4579 .devices = { 4668 4580 { "Hauppauge ATSC MiniCard (B200)", 4669 - { &dib0700_usb_id_table[46], NULL }, 4581 + { &dib0700_usb_id_table[HAUPPAUGE_TIGER_ATSC], NULL }, 4670 4582 { NULL }, 4671 4583 }, 4672 4584 { "Hauppauge ATSC MiniCard (B210)", 4673 - { &dib0700_usb_id_table[47], NULL }, 4585 + { &dib0700_usb_id_table[HAUPPAUGE_TIGER_ATSC_B210], NULL }, 4674 4586 { NULL }, 4675 4587 }, 4676 4588 }, ··· 4696 4608 .num_device_descs = 4, 4697 4609 .devices = { 4698 4610 { "DiBcom STK7770P reference design", 4699 - { &dib0700_usb_id_table[59], NULL }, 4611 + { &dib0700_usb_id_table[DIBCOM_STK7770P], NULL }, 4700 4612 { NULL }, 4701 4613 }, 4702 4614 { "Terratec Cinergy T USB XXS (HD)/ T3", 4703 - { &dib0700_usb_id_table[33], 4704 - &dib0700_usb_id_table[52], 4705 - &dib0700_usb_id_table[60], NULL}, 4615 + { &dib0700_usb_id_table[TERRATEC_CINERGY_T_XXS], 4616 + &dib0700_usb_id_table[TERRATEC_T3], 4617 + &dib0700_usb_id_table[TERRATEC_CINERGY_T_XXS_2], NULL}, 4706 4618 { NULL }, 4707 4619 }, 4708 4620 { "TechniSat AirStar TeleStick 2", 4709 - { &dib0700_usb_id_table[74], NULL }, 4621 + { &dib0700_usb_id_table[TECHNISAT_AIRSTAR_TELESTICK_2], NULL }, 4710 4622 { NULL }, 4711 4623 }, 4712 4624 { "Medion CTX1921 DVB-T USB", 4713 - { &dib0700_usb_id_table[75], NULL }, 4625 + { &dib0700_usb_id_table[MEDION_CREATIX_CTX1921], NULL }, 4714 4626 { NULL }, 4715 4627 }, 4716 4628 }, ··· 4746 4658 .num_device_descs = 3, 4747 4659 .devices = { 4748 4660 { "DiBcom STK807xP reference design", 4749 - { &dib0700_usb_id_table[62], NULL }, 4661 + { &dib0700_usb_id_table[DIBCOM_STK807XP], NULL }, 4750 4662 { NULL }, 4751 4663 }, 4752 4664 { "Prolink Pixelview SBTVD", 4753 - { &dib0700_usb_id_table[63], NULL }, 4665 + { &dib0700_usb_id_table[PIXELVIEW_SBTVD], NULL }, 4754 4666 { NULL }, 4755 4667 }, 4756 4668 { "EvolutePC TVWay+", 4757 - { &dib0700_usb_id_table[64], NULL }, 4669 + { &dib0700_usb_id_table[EVOLUTEPC_TVWAY_PLUS], NULL }, 4758 4670 { NULL }, 4759 4671 }, 4760 4672 }, ··· 4803 4715 .num_device_descs = 1, 4804 4716 .devices = { 4805 4717 { "DiBcom STK807xPVR reference design", 4806 - { &dib0700_usb_id_table[61], NULL }, 4718 + { &dib0700_usb_id_table[DIBCOM_STK807XPVR], NULL }, 4807 4719 { NULL }, 4808 4720 }, 4809 4721 }, ··· 4840 4752 .num_device_descs = 1, 4841 4753 .devices = { 4842 4754 { "DiBcom STK8096GP reference design", 4843 - { &dib0700_usb_id_table[67], NULL }, 4755 + { &dib0700_usb_id_table[DIBCOM_STK8096GP], NULL }, 4844 4756 { NULL }, 4845 4757 }, 4846 4758 }, ··· 4877 4789 .num_device_descs = 1, 4878 4790 .devices = { 4879 4791 { "DiBcom STK9090M reference design", 4880 - { &dib0700_usb_id_table[69], NULL }, 4792 + { &dib0700_usb_id_table[DIBCOM_NIM9090M], NULL }, 4881 4793 { NULL }, 4882 4794 }, 4883 4795 }, ··· 4914 4826 .num_device_descs = 1, 4915 4827 .devices = { 4916 4828 { "DiBcom NIM8096MD reference design", 4917 - { &dib0700_usb_id_table[70], NULL }, 4829 + { &dib0700_usb_id_table[DIBCOM_NIM8096MD], NULL }, 4918 4830 { NULL }, 4919 4831 }, 4920 4832 }, ··· 4951 4863 .num_device_descs = 1, 4952 4864 .devices = { 4953 4865 { "DiBcom NIM9090MD reference design", 4954 - { &dib0700_usb_id_table[71], NULL }, 4866 + { &dib0700_usb_id_table[DIBCOM_NIM9090MD], NULL }, 4955 4867 { NULL }, 4956 4868 }, 4957 4869 }, ··· 4988 4900 .num_device_descs = 1, 4989 4901 .devices = { 4990 4902 { "DiBcom NIM7090 reference design", 4991 - { &dib0700_usb_id_table[72], NULL }, 4903 + { &dib0700_usb_id_table[DIBCOM_NIM7090], NULL }, 4992 4904 { NULL }, 4993 4905 }, 4994 4906 }, ··· 5039 4951 .num_device_descs = 1, 5040 4952 .devices = { 5041 4953 { "DiBcom TFE7090PVR reference design", 5042 - { &dib0700_usb_id_table[73], NULL }, 4954 + { &dib0700_usb_id_table[DIBCOM_TFE7090PVR], NULL }, 5043 4955 { NULL }, 5044 4956 }, 5045 4957 }, ··· 5071 4983 .num_device_descs = 2, 5072 4984 .devices = { 5073 4985 { "Pinnacle PCTV 340e HD Pro USB Stick", 5074 - { &dib0700_usb_id_table[76], NULL }, 4986 + { &dib0700_usb_id_table[PINNACLE_PCTV340E], NULL }, 5075 4987 { NULL }, 5076 4988 }, 5077 4989 { "Pinnacle PCTV Hybrid Stick Solo", 5078 - { &dib0700_usb_id_table[77], NULL }, 4990 + { &dib0700_usb_id_table[PINNACLE_PCTV340E_SE], NULL }, 5079 4991 { NULL }, 5080 4992 }, 5081 4993 }, ··· 5111 5023 .num_device_descs = 1, 5112 5024 .devices = { 5113 5025 { "DiBcom TFE7790P reference design", 5114 - { &dib0700_usb_id_table[78], NULL }, 5026 + { &dib0700_usb_id_table[DIBCOM_TFE7790P], NULL }, 5115 5027 { NULL }, 5116 5028 }, 5117 5029 }, ··· 5149 5061 .num_device_descs = 1, 5150 5062 .devices = { 5151 5063 { "DiBcom TFE8096P reference design", 5152 - { &dib0700_usb_id_table[79], NULL }, 5064 + { &dib0700_usb_id_table[DIBCOM_TFE8096P], NULL }, 5153 5065 { NULL }, 5154 5066 }, 5155 5067 }, ··· 5202 5114 .num_device_descs = 1, 5203 5115 .devices = { 5204 5116 { "DiBcom STK8096-PVR reference design", 5205 - { &dib0700_usb_id_table[83], 5206 - &dib0700_usb_id_table[84], NULL}, 5117 + { &dib0700_usb_id_table[PCTV_DIBCOM_STK8096PVR], 5118 + &dib0700_usb_id_table[DIBCOM_STK8096PVR], NULL}, 5207 5119 { NULL }, 5208 5120 }, 5209 5121 }, ··· 5233 5145 .num_device_descs = 1, 5234 5146 .devices = { 5235 5147 { "Microsoft Xbox One Digital TV Tuner", 5236 - { &dib0700_usb_id_table[86], NULL }, 5148 + { &dib0700_usb_id_table[MICROSOFT_XBOX_ONE_TUNER], NULL }, 5237 5149 { NULL }, 5238 5150 }, 5239 5151 },
+10 -7
include/media/dvb-usb-ids.h
··· 110 110 #define USB_PID_ANUBIS_LIFEVIEW_TV_WALKER_TWIN_WARM 0x0513 111 111 #define USB_PID_ANUBIS_MSI_DIGI_VOX_MINI_II 0x1513 112 112 #define USB_PID_ANYSEE 0x861f 113 - #define USB_PID_ARTEC_T14BR 0x810f 114 113 #define USB_PID_ASUS_U3000 0x171f 115 114 #define USB_PID_ASUS_U3000H 0x1736 116 115 #define USB_PID_ASUS_U3100 0x173f ··· 157 158 #define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397 158 159 #define USB_PID_CONEXANT_D680_DMB 0x86d6 159 160 #define USB_PID_CPYTO_REDI_PC50A 0xa803 160 - #define USB_PID_CREATIX_CTX1921 0x1921 161 161 #define USB_PID_CTVDIGDUAL_V2 0xe410 162 162 #define USB_PID_CYPRESS_DW2101 0x2101 163 163 #define USB_PID_CYPRESS_DW2102 0x2102 ··· 224 226 #define USB_PID_EMPIA_DIGIVOX_MINI_SL_WARM 0xe361 225 227 #define USB_PID_EMPIA_VSTREAM_COLD 0x17de 226 228 #define USB_PID_EMPIA_VSTREAM_WARM 0x17df 229 + #define USB_PID_EVOLUTEPC_TVWAY_PLUS 0x0002 227 230 #define USB_PID_EVOLVEO_XTRATV_STICK 0xa115 228 231 #define USB_PID_FREECOM_DVBT 0x0160 229 232 #define USB_PID_FREECOM_DVBT_2 0x0161 ··· 287 288 #define USB_PID_KYE_DVB_T_COLD 0x701e 288 289 #define USB_PID_KYE_DVB_T_WARM 0x701f 289 290 #define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_COLD 0x6025 291 + #define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_H 0x60f6 292 + #define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_STK7700P 0x6f00 293 + #define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_STK7700P_2 0x6f01 290 294 #define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_WARM 0x6026 291 295 #define USB_PID_LITEON_DVB_T_COLD 0xf000 292 296 #define USB_PID_LITEON_DVB_T_WARM 0xf001 297 + #define USB_PID_MEDION_CREATIX_CTX1921 0x1921 293 298 #define USB_PID_MEDION_MD95700 0x0932 299 + #define USB_PID_MICROSOFT_XBOX_ONE_TUNER 0x02d5 294 300 #define USB_PID_MIGLIA_WT220U_ZAP250_COLD 0x0220 295 301 #define USB_PID_MSI_DIGIVOX_DUO 0x8801 296 302 #define USB_PID_MSI_DIGI_VOX_MINI_III 0x8807 ··· 317 313 #define USB_PID_PCTV_200E 0x020e 318 314 #define USB_PID_PCTV_78E 0x025a 319 315 #define USB_PID_PCTV_79E 0x0262 316 + #define USB_PID_PCTV_DIBCOM_STK8096PVR 0x1faa 317 + #define USB_PID_PCTV_PINNACLE_PCTV282E 0x0248 318 + #define USB_PID_PCTV_PINNACLE_PCTV73ESE 0x0245 320 319 #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e 321 320 #define USB_PID_PINNACLE_PCTV2000E 0x022c 322 321 #define USB_PID_PINNACLE_PCTV282E 0x0248 ··· 415 408 #define USB_PID_TREKSTOR_DVBT 0x901b 416 409 #define USB_PID_TREKSTOR_TERRES_2_0 0xC803 417 410 #define USB_PID_TURBOX_DTT_2000 0xd3a4 418 - #define USB_PID_TVWAY_PLUS 0x0002 419 411 #define USB_PID_TWINHAN_VP7021_WARM 0x3208 420 412 #define USB_PID_TWINHAN_VP7041_COLD 0x3201 421 413 #define USB_PID_TWINHAN_VP7041_WARM 0x3202 414 + #define USB_PID_ULTIMA_ARTEC_T14BR 0x810f 422 415 #define USB_PID_ULTIMA_ARTEC_T14_COLD 0x810b 423 416 #define USB_PID_ULTIMA_ARTEC_T14_WARM 0x810c 424 417 #define USB_PID_ULTIMA_TVBOX_AN2235_COLD 0x8107 ··· 457 450 #define USB_PID_WINFAST_DTV2000DS 0x6a04 458 451 #define USB_PID_WINFAST_DTV2000DS_PLUS 0x6f12 459 452 #define USB_PID_WINFAST_DTV_DONGLE_GOLD 0x6029 460 - #define USB_PID_WINFAST_DTV_DONGLE_H 0x60f6 461 453 #define USB_PID_WINFAST_DTV_DONGLE_MINID 0x6f0f 462 - #define USB_PID_WINFAST_DTV_DONGLE_STK7700P 0x6f00 463 - #define USB_PID_WINFAST_DTV_DONGLE_STK7700P_2 0x6f01 464 454 #define USB_PID_WINTV_SOLOHD 0x0264 465 455 #define USB_PID_WINTV_SOLOHD_2 0x8268 466 - #define USB_PID_XBOX_ONE_TUNER 0x02d5 467 456 #define USB_PID_XTENSIONS_XD_380 0x0381 468 457 #define USB_PID_YUAN_EC372S 0x1edc 469 458 #define USB_PID_YUAN_MC770 0x0871