History

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.

Mauro Carvalho Chehab committed 4 years ago

Commit 3d591421 parent 281b21c2 files · +268 −177Browse files

Unified · Split

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