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
38163816
38173817
38183818 /* DVB-USB and USB stuff follows */
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,
3907+};
3908+
38193909 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 */
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+ { }
39113998 };
3999+
39124000 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
39134001
39144002 #define DIB0700_DEFAULT_DEVICE_PROPERTIES \
@@ -3962,35 +4050,35 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 47 unmodified lines
39624050 .num_device_descs = 8,
39634051 .devices = {
39644052 { "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] },
39664054 { NULL },
39674055 },
39684056 { "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 },
39704058 { NULL },
39714059 },
39724060 { "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] },
39744062 { NULL },
39754063 },
39764064 { "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] },
39784066 { NULL },
39794067 },
39804068 { "Uniwill STK7700P based (Hama and others)",
3981− { &dib0700_usb_id_table[7], NULL },
4069+ { &dib0700_usb_id_table[UNIWILL_STK7700P], NULL },
39824070 { NULL },
39834071 },
39844072 { "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] },
39864074 { NULL },
39874075 },
39884076 { "AVerMedia AVerTV DVB-T Express",
3989− { &dib0700_usb_id_table[20] },
4077+ { &dib0700_usb_id_table[AVERMEDIA_EXPRESS] },
39904078 { NULL },
39914079 },
39924080 { "Gigabyte U7000",
3993− { &dib0700_usb_id_table[21], NULL },
4081+ { &dib0700_usb_id_table[GIGABYTE_U7000], NULL },
39944082 { NULL },
39954083 }
39964084 },
@@ -4030,7 +4118,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 33 unmodified lines
40304118 .num_device_descs = 1,
40314119 .devices = {
40324120 { "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 },
40344122 { NULL },
40354123 },
40364124 },
@@ -4078,23 +4166,23 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 41 unmodified lines
40784166 .num_device_descs = 5,
40794167 .devices = {
40804168 { "Pinnacle PCTV 2000e",
4081− { &dib0700_usb_id_table[11], NULL },
4169+ { &dib0700_usb_id_table[PINNACLE_PCTV2000E], NULL },
40824170 { NULL },
40834171 },
40844172 { "Terratec Cinergy DT XS Diversity",
4085− { &dib0700_usb_id_table[12], NULL },
4173+ { &dib0700_usb_id_table[TERRATEC_CINERGY_DT_XS_DIVERSITY], NULL },
40864174 { NULL },
40874175 },
40884176 { "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 },
40904178 { NULL },
40914179 },
40924180 { "DiBcom STK7700D reference design",
4093− { &dib0700_usb_id_table[14], NULL },
4181+ { &dib0700_usb_id_table[DIBCOM_STK7700D], NULL },
40944182 { NULL },
40954183 },
40964184 { "YUAN High-Tech DiBcom STK7700D",
4097− { &dib0700_usb_id_table[55], NULL },
4185+ { &dib0700_usb_id_table[YUAN_STK7700D_2], NULL },
40984186 { NULL },
40994187 },
41004188
@@ -4131,15 +4219,15 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
41314219 .num_device_descs = 3,
41324220 .devices = {
41334221 { "ASUS My Cinema U3000 Mini DVBT Tuner",
4134− { &dib0700_usb_id_table[23], NULL },
4222+ { &dib0700_usb_id_table[ASUS_U3000], NULL },
41354223 { NULL },
41364224 },
41374225 { "Yuan EC372S",
4138− { &dib0700_usb_id_table[31], NULL },
4226+ { &dib0700_usb_id_table[YUAN_EC372S], NULL },
41394227 { NULL },
41404228 },
41414229 { "Terratec Cinergy T Express",
4142− { &dib0700_usb_id_table[42], NULL },
4230+ { &dib0700_usb_id_table[TERRATEC_CINERGY_T_EXPRESS], NULL },
41434231 { NULL },
41444232 }
41454233 },
@@ -4176,51 +4264,51 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
41764264 .num_device_descs = 12,
41774265 .devices = {
41784266 { "DiBcom STK7070P reference design",
4179− { &dib0700_usb_id_table[15], NULL },
4267+ { &dib0700_usb_id_table[DIBCOM_STK7070P], NULL },
41804268 { NULL },
41814269 },
41824270 { "Pinnacle PCTV DVB-T Flash Stick",
4183− { &dib0700_usb_id_table[16], NULL },
4271+ { &dib0700_usb_id_table[PINNACLE_PCTV_DVB_T_FLASH], NULL },
41844272 { NULL },
41854273 },
41864274 { "Artec T14BR DVB-T",
4187− { &dib0700_usb_id_table[22], NULL },
4275+ { &dib0700_usb_id_table[ULTIMA_ARTEC_T14BR], NULL },
41884276 { NULL },
41894277 },
41904278 { "ASUS My Cinema U3100 Mini DVBT Tuner",
4191− { &dib0700_usb_id_table[24], NULL },
4279+ { &dib0700_usb_id_table[ASUS_U3100], NULL },
41924280 { NULL },
41934281 },
41944282 { "Hauppauge Nova-T Stick",
4195− { &dib0700_usb_id_table[25], NULL },
4283+ { &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_STICK_3], NULL },
41964284 { NULL },
41974285 },
41984286 { "Hauppauge Nova-T MyTV.t",
4199− { &dib0700_usb_id_table[26], NULL },
4287+ { &dib0700_usb_id_table[HAUPPAUGE_MYTV_T], NULL },
42004288 { NULL },
42014289 },
42024290 { "Pinnacle PCTV 72e",
4203− { &dib0700_usb_id_table[29], NULL },
4291+ { &dib0700_usb_id_table[PINNACLE_PCTV72E], NULL },
42044292 { NULL },
42054293 },
42064294 { "Pinnacle PCTV 73e",
4207− { &dib0700_usb_id_table[30], NULL },
4295+ { &dib0700_usb_id_table[PINNACLE_PCTV73E], NULL },
42084296 { NULL },
42094297 },
42104298 { "Elgato EyeTV DTT",
4211− { &dib0700_usb_id_table[49], NULL },
4299+ { &dib0700_usb_id_table[ELGATO_EYETV_DTT], NULL },
42124300 { NULL },
42134301 },
42144302 { "Yuan PD378S",
4215− { &dib0700_usb_id_table[45], NULL },
4303+ { &dib0700_usb_id_table[YUAN_PD378S], NULL },
42164304 { NULL },
42174305 },
42184306 { "Elgato EyeTV Dtt Dlx PD378S",
4219− { &dib0700_usb_id_table[50], NULL },
4307+ { &dib0700_usb_id_table[ELGATO_EYETV_DTT_Dlx], NULL },
42204308 { NULL },
42214309 },
42224310 { "Elgato EyeTV DTT rev. 2",
4223− { &dib0700_usb_id_table[80], NULL },
4311+ { &dib0700_usb_id_table[ELGATO_EYETV_DTT_2], NULL },
42244312 { NULL },
42254313 },
42264314 },
@@ -4257,15 +4345,15 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
42574345 .num_device_descs = 3,
42584346 .devices = {
42594347 { "Pinnacle PCTV 73A",
4260− { &dib0700_usb_id_table[56], NULL },
4348+ { &dib0700_usb_id_table[PINNACLE_PCTV73A], NULL },
42614349 { NULL },
42624350 },
42634351 { "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 },
42654353 { NULL },
42664354 },
42674355 { "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 },
42694357 { NULL },
42704358 },
42714359 },
@@ -4314,15 +4402,15 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 42 unmodified lines
43144402 .num_device_descs = 3,
43154403 .devices = {
43164404 { "Hauppauge Nova-TD Stick (52009)",
4317− { &dib0700_usb_id_table[35], NULL },
4405+ { &dib0700_usb_id_table[HAUPPAUGE_NOVA_TD_STICK_52009], NULL },
43184406 { NULL },
43194407 },
43204408 { "PCTV 2002e",
4321− { &dib0700_usb_id_table[81], NULL },
4409+ { &dib0700_usb_id_table[PCTV_2002E], NULL },
43224410 { NULL },
43234411 },
43244412 { "PCTV 2002e SE",
4325− { &dib0700_usb_id_table[82], NULL },
4413+ { &dib0700_usb_id_table[PCTV_2002E_SE], NULL },
43264414 { NULL },
43274415 },
43284416 },
@@ -4371,24 +4459,24 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 42 unmodified lines
43714459 .num_device_descs = 5,
43724460 .devices = {
43734461 { "DiBcom STK7070PD reference design",
4374− { &dib0700_usb_id_table[17], NULL },
4462+ { &dib0700_usb_id_table[DIBCOM_STK7070PD], NULL },
43754463 { NULL },
43764464 },
43774465 { "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 },
43794467 { NULL },
43804468 },
43814469 { "Hauppauge Nova-TD-500 (84xxx)",
4382− { &dib0700_usb_id_table[36], NULL },
4470+ { &dib0700_usb_id_table[HAUPPAUGE_NOVA_T_500_3], NULL },
43834471 { NULL },
43844472 },
43854473 { "Terratec Cinergy DT USB XS Diversity/ T5",
4386− { &dib0700_usb_id_table[43],
4387− &dib0700_usb_id_table[53], NULL},
4474+ { &dib0700_usb_id_table[TERRATEC_CINERGY_DT_XS_DIVERSITY_2],
4475+ &dib0700_usb_id_table[TERRATEC_T5], NULL},
43884476 { NULL },
43894477 },
43904478 { "Sony PlayTV",
4391− { &dib0700_usb_id_table[44], NULL },
4479+ { &dib0700_usb_id_table[SONY_PLAYTV], NULL },
43924480 { NULL },
43934481 },
43944482 },
@@ -4437,7 +4525,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 42 unmodified lines
44374525 .num_device_descs = 1,
44384526 .devices = {
44394527 { "Elgato EyeTV Diversity",
4440− { &dib0700_usb_id_table[68], NULL },
4528+ { &dib0700_usb_id_table[ELGATO_EYETV_DIVERSITY], NULL },
44414529 { NULL },
44424530 },
44434531 },
@@ -4474,43 +4562,43 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
44744562 .num_device_descs = 10,
44754563 .devices = {
44764564 { "Terratec Cinergy HT USB XE",
4477− { &dib0700_usb_id_table[27], NULL },
4565+ { &dib0700_usb_id_table[TERRATEC_CINERGY_HT_USB_XE], NULL },
44784566 { NULL },
44794567 },
44804568 { "Pinnacle Expresscard 320cx",
4481− { &dib0700_usb_id_table[28], NULL },
4569+ { &dib0700_usb_id_table[PINNACLE_EXPRESSCARD_320CX], NULL },
44824570 { NULL },
44834571 },
44844572 { "Terratec Cinergy HT Express",
4485− { &dib0700_usb_id_table[32], NULL },
4573+ { &dib0700_usb_id_table[TERRATEC_CINERGY_HT_EXPRESS], NULL },
44864574 { NULL },
44874575 },
44884576 { "Gigabyte U8000-RH",
4489− { &dib0700_usb_id_table[37], NULL },
4577+ { &dib0700_usb_id_table[GIGABYTE_U8000], NULL },
44904578 { NULL },
44914579 },
44924580 { "YUAN High-Tech STK7700PH",
4493− { &dib0700_usb_id_table[38], NULL },
4581+ { &dib0700_usb_id_table[YUAN_STK7700PH], NULL },
44944582 { NULL },
44954583 },
44964584 { "Asus My Cinema-U3000Hybrid",
4497− { &dib0700_usb_id_table[39], NULL },
4585+ { &dib0700_usb_id_table[ASUS_U3000H], NULL },
44984586 { NULL },
44994587 },
45004588 { "YUAN High-Tech MC770",
4501− { &dib0700_usb_id_table[48], NULL },
4589+ { &dib0700_usb_id_table[YUAN_MC770], NULL },
45024590 { NULL },
45034591 },
45044592 { "Leadtek WinFast DTV Dongle H",
4505− { &dib0700_usb_id_table[51], NULL },
4593+ { &dib0700_usb_id_table[LEADTEK_WINFAST_DTV_DONGLE_H], NULL },
45064594 { NULL },
45074595 },
45084596 { "YUAN High-Tech STK7700D",
4509− { &dib0700_usb_id_table[54], NULL },
4597+ { &dib0700_usb_id_table[YUAN_STK7700D], NULL },
45104598 { NULL },
45114599 },
45124600 { "Hama DVB=T Hybrid USB Stick",
4513− { &dib0700_usb_id_table[85], NULL },
4601+ { &dib0700_usb_id_table[HAMA_DVBT_HYBRID], NULL },
45144602 { NULL },
45154603 },
45164604 },
@@ -4542,11 +4630,11 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 25 unmodified lines
45424630 .num_device_descs = 2,
45434631 .devices = {
45444632 { "Pinnacle PCTV HD Pro USB Stick",
4545− { &dib0700_usb_id_table[40], NULL },
4633+ { &dib0700_usb_id_table[PINNACLE_PCTV801E], NULL },
45464634 { NULL },
45474635 },
45484636 { "Pinnacle PCTV HD USB Stick",
4549− { &dib0700_usb_id_table[41], NULL },
4637+ { &dib0700_usb_id_table[PINNACLE_PCTV801E_SE], NULL },
45504638 { NULL },
45514639 },
45524640 },
@@ -4578,11 +4666,11 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 25 unmodified lines
45784666 .num_device_descs = 2,
45794667 .devices = {
45804668 { "Hauppauge ATSC MiniCard (B200)",
4581− { &dib0700_usb_id_table[46], NULL },
4669+ { &dib0700_usb_id_table[HAUPPAUGE_TIGER_ATSC], NULL },
45824670 { NULL },
45834671 },
45844672 { "Hauppauge ATSC MiniCard (B210)",
4585− { &dib0700_usb_id_table[47], NULL },
4673+ { &dib0700_usb_id_table[HAUPPAUGE_TIGER_ATSC_B210], NULL },
45864674 { NULL },
45874675 },
45884676 },
@@ -4608,21 +4696,21 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 19 unmodified lines
46084696 .num_device_descs = 4,
46094697 .devices = {
46104698 { "DiBcom STK7770P reference design",
4611− { &dib0700_usb_id_table[59], NULL },
4699+ { &dib0700_usb_id_table[DIBCOM_STK7770P], NULL },
46124700 { NULL },
46134701 },
46144702 { "Terratec Cinergy T USB XXS (HD)/ T3",
4615− { &dib0700_usb_id_table[33],
4616− &dib0700_usb_id_table[52],
4617− &dib0700_usb_id_table[60], NULL},
4703+ { &dib0700_usb_id_table[TERRATEC_CINERGY_T_XXS],
4704+ &dib0700_usb_id_table[TERRATEC_T3],
4705+ &dib0700_usb_id_table[TERRATEC_CINERGY_T_XXS_2], NULL},
46184706 { NULL },
46194707 },
46204708 { "TechniSat AirStar TeleStick 2",
4621− { &dib0700_usb_id_table[74], NULL },
4709+ { &dib0700_usb_id_table[TECHNISAT_AIRSTAR_TELESTICK_2], NULL },
46224710 { NULL },
46234711 },
46244712 { "Medion CTX1921 DVB-T USB",
4625− { &dib0700_usb_id_table[75], NULL },
4713+ { &dib0700_usb_id_table[MEDION_CREATIX_CTX1921], NULL },
46264714 { NULL },
46274715 },
46284716 },
@@ -4658,15 +4746,15 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 29 unmodified lines
46584746 .num_device_descs = 3,
46594747 .devices = {
46604748 { "DiBcom STK807xP reference design",
4661− { &dib0700_usb_id_table[62], NULL },
4749+ { &dib0700_usb_id_table[DIBCOM_STK807XP], NULL },
46624750 { NULL },
46634751 },
46644752 { "Prolink Pixelview SBTVD",
4665− { &dib0700_usb_id_table[63], NULL },
4753+ { &dib0700_usb_id_table[PIXELVIEW_SBTVD], NULL },
46664754 { NULL },
46674755 },
46684756 { "EvolutePC TVWay+",
4669− { &dib0700_usb_id_table[64], NULL },
4757+ { &dib0700_usb_id_table[EVOLUTEPC_TVWAY_PLUS], NULL },
46704758 { NULL },
46714759 },
46724760 },
@@ -4715,7 +4803,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 42 unmodified lines
47154803 .num_device_descs = 1,
47164804 .devices = {
47174805 { "DiBcom STK807xPVR reference design",
4718− { &dib0700_usb_id_table[61], NULL },
4806+ { &dib0700_usb_id_table[DIBCOM_STK807XPVR], NULL },
47194807 { NULL },
47204808 },
47214809 },
@@ -4752,7 +4840,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
47524840 .num_device_descs = 1,
47534841 .devices = {
47544842 { "DiBcom STK8096GP reference design",
4755− { &dib0700_usb_id_table[67], NULL },
4843+ { &dib0700_usb_id_table[DIBCOM_STK8096GP], NULL },
47564844 { NULL },
47574845 },
47584846 },
@@ -4789,7 +4877,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
47894877 .num_device_descs = 1,
47904878 .devices = {
47914879 { "DiBcom STK9090M reference design",
4792− { &dib0700_usb_id_table[69], NULL },
4880+ { &dib0700_usb_id_table[DIBCOM_NIM9090M], NULL },
47934881 { NULL },
47944882 },
47954883 },
@@ -4826,7 +4914,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
48264914 .num_device_descs = 1,
48274915 .devices = {
48284916 { "DiBcom NIM8096MD reference design",
4829− { &dib0700_usb_id_table[70], NULL },
4917+ { &dib0700_usb_id_table[DIBCOM_NIM8096MD], NULL },
48304918 { NULL },
48314919 },
48324920 },
@@ -4863,7 +4951,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
48634951 .num_device_descs = 1,
48644952 .devices = {
48654953 { "DiBcom NIM9090MD reference design",
4866− { &dib0700_usb_id_table[71], NULL },
4954+ { &dib0700_usb_id_table[DIBCOM_NIM9090MD], NULL },
48674955 { NULL },
48684956 },
48694957 },
@@ -4900,7 +4988,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 30 unmodified lines
49004988 .num_device_descs = 1,
49014989 .devices = {
49024990 { "DiBcom NIM7090 reference design",
4903− { &dib0700_usb_id_table[72], NULL },
4991+ { &dib0700_usb_id_table[DIBCOM_NIM7090], NULL },
49044992 { NULL },
49054993 },
49064994 },
@@ -4951,7 +5039,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 44 unmodified lines
49515039 .num_device_descs = 1,
49525040 .devices = {
49535041 { "DiBcom TFE7090PVR reference design",
4954− { &dib0700_usb_id_table[73], NULL },
5042+ { &dib0700_usb_id_table[DIBCOM_TFE7090PVR], NULL },
49555043 { NULL },
49565044 },
49575045 },
@@ -4983,11 +5071,11 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 25 unmodified lines
49835071 .num_device_descs = 2,
49845072 .devices = {
49855073 { "Pinnacle PCTV 340e HD Pro USB Stick",
4986− { &dib0700_usb_id_table[76], NULL },
5074+ { &dib0700_usb_id_table[PINNACLE_PCTV340E], NULL },
49875075 { NULL },
49885076 },
49895077 { "Pinnacle PCTV Hybrid Stick Solo",
4990− { &dib0700_usb_id_table[77], NULL },
5078+ { &dib0700_usb_id_table[PINNACLE_PCTV340E_SE], NULL },
49915079 { NULL },
49925080 },
49935081 },
@@ -5023,7 +5111,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 29 unmodified lines
50235111 .num_device_descs = 1,
50245112 .devices = {
50255113 { "DiBcom TFE7790P reference design",
5026− { &dib0700_usb_id_table[78], NULL },
5114+ { &dib0700_usb_id_table[DIBCOM_TFE7790P], NULL },
50275115 { NULL },
50285116 },
50295117 },
@@ -5061,7 +5149,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 31 unmodified lines
50615149 .num_device_descs = 1,
50625150 .devices = {
50635151 { "DiBcom TFE8096P reference design",
5064− { &dib0700_usb_id_table[79], NULL },
5152+ { &dib0700_usb_id_table[DIBCOM_TFE8096P], NULL },
50655153 { NULL },
50665154 },
50675155 },
@@ -5114,8 +5202,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 46 unmodified lines
51145202 .num_device_descs = 1,
51155203 .devices = {
51165204 { "DiBcom STK8096-PVR reference design",
5117− { &dib0700_usb_id_table[83],
5118− &dib0700_usb_id_table[84], NULL},
5205+ { &dib0700_usb_id_table[PCTV_DIBCOM_STK8096PVR],
5206+ &dib0700_usb_id_table[DIBCOM_STK8096PVR], NULL},
51195207 { NULL },
51205208 },
51215209 },
@@ -5145,7 +5233,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { · 23 unmodified lines
51455233 .num_device_descs = 1,
51465234 .devices = {
51475235 { "Microsoft Xbox One Digital TV Tuner",
5148− { &dib0700_usb_id_table[86], NULL },
5236+ { &dib0700_usb_id_table[MICROSOFT_XBOX_ONE_TUNER], NULL },
51495237 { NULL },
51505238 },
51515239 },
include/media/dvb-usb-ids.h+10−7
@@ -110,7 +110,6 @@ · 109 unmodified lines
110110 #define USB_PID_ANUBIS_LIFEVIEW_TV_WALKER_TWIN_WARM 0x0513
111111 #define USB_PID_ANUBIS_MSI_DIGI_VOX_MINI_II 0x1513
112112 #define USB_PID_ANYSEE 0x861f
113−#define USB_PID_ARTEC_T14BR 0x810f
114113 #define USB_PID_ASUS_U3000 0x171f
115114 #define USB_PID_ASUS_U3000H 0x1736
116115 #define USB_PID_ASUS_U3100 0x173f
@@ -158,7 +157,6 @@ · 41 unmodified lines
158157 #define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397
159158 #define USB_PID_CONEXANT_D680_DMB 0x86d6
160159 #define USB_PID_CPYTO_REDI_PC50A 0xa803
161−#define USB_PID_CREATIX_CTX1921 0x1921
162160 #define USB_PID_CTVDIGDUAL_V2 0xe410
163161 #define USB_PID_CYPRESS_DW2101 0x2101
164162 #define USB_PID_CYPRESS_DW2102 0x2102
@@ -226,6 +224,7 @@ · 61 unmodified lines
226224 #define USB_PID_EMPIA_DIGIVOX_MINI_SL_WARM 0xe361
227225 #define USB_PID_EMPIA_VSTREAM_COLD 0x17de
228226 #define USB_PID_EMPIA_VSTREAM_WARM 0x17df
227+#define USB_PID_EVOLUTEPC_TVWAY_PLUS 0x0002
229228 #define USB_PID_EVOLVEO_XTRATV_STICK 0xa115
230229 #define USB_PID_FREECOM_DVBT 0x0160
231230 #define USB_PID_FREECOM_DVBT_2 0x0161
@@ -288,10 +287,15 @@ · 56 unmodified lines
288287 #define USB_PID_KYE_DVB_T_COLD 0x701e
289288 #define USB_PID_KYE_DVB_T_WARM 0x701f
290289 #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
291293 #define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_WARM 0x6026
292294 #define USB_PID_LITEON_DVB_T_COLD 0xf000
293295 #define USB_PID_LITEON_DVB_T_WARM 0xf001
296+#define USB_PID_MEDION_CREATIX_CTX1921 0x1921
294297 #define USB_PID_MEDION_MD95700 0x0932
298+#define USB_PID_MICROSOFT_XBOX_ONE_TUNER 0x02d5
295299 #define USB_PID_MIGLIA_WT220U_ZAP250_COLD 0x0220
296300 #define USB_PID_MSI_DIGIVOX_DUO 0x8801
297301 #define USB_PID_MSI_DIGI_VOX_MINI_III 0x8807
@@ -313,6 +317,9 @@ · 15 unmodified lines
313317 #define USB_PID_PCTV_200E 0x020e
314318 #define USB_PID_PCTV_78E 0x025a
315319 #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
316323 #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
317324 #define USB_PID_PINNACLE_PCTV2000E 0x022c
318325 #define USB_PID_PINNACLE_PCTV282E 0x0248
@@ -408,10 +415,10 @@ · 89 unmodified lines
408415 #define USB_PID_TREKSTOR_DVBT 0x901b
409416 #define USB_PID_TREKSTOR_TERRES_2_0 0xC803
410417 #define USB_PID_TURBOX_DTT_2000 0xd3a4
411−#define USB_PID_TVWAY_PLUS 0x0002
412418 #define USB_PID_TWINHAN_VP7021_WARM 0x3208
413419 #define USB_PID_TWINHAN_VP7041_COLD 0x3201
414420 #define USB_PID_TWINHAN_VP7041_WARM 0x3202
421+#define USB_PID_ULTIMA_ARTEC_T14BR 0x810f
415422 #define USB_PID_ULTIMA_ARTEC_T14_COLD 0x810b
416423 #define USB_PID_ULTIMA_ARTEC_T14_WARM 0x810c
417424 #define USB_PID_ULTIMA_TVBOX_AN2235_COLD 0x8107
@@ -450,13 +457,9 @@ · 32 unmodified lines
450457 #define USB_PID_WINFAST_DTV2000DS 0x6a04
451458 #define USB_PID_WINFAST_DTV2000DS_PLUS 0x6f12
452459 #define USB_PID_WINFAST_DTV_DONGLE_GOLD 0x6029
453−#define USB_PID_WINFAST_DTV_DONGLE_H 0x60f6
454460 #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
457461 #define USB_PID_WINTV_SOLOHD 0x0264
458462 #define USB_PID_WINTV_SOLOHD_2 0x8268
459−#define USB_PID_XBOX_ONE_TUNER 0x02d5
460463 #define USB_PID_XTENSIONS_XD_380 0x0381
461464 #define USB_PID_YUAN_EC372S 0x1edc
462465 #define USB_PID_YUAN_MC770 0x0871