Commit 3d59142a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 281b21c5

drivers/media/usb/dvb-usb/dib0700_devices.c

+258 −170

File changed.

Preview size limit exceeded, changes collapsed.

include/media/dvb-usb-ids.h

+10 −7
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
#define USB_PID_ANUBIS_LIFEVIEW_TV_WALKER_TWIN_WARM	0x0513

#define USB_PID_ANUBIS_MSI_DIGI_VOX_MINI_II		0x1513

#define USB_PID_ANYSEE					0x861f

#define USB_PID_ARTEC_T14BR				0x810f

#define USB_PID_ASUS_U3000				0x171f

#define USB_PID_ASUS_U3000H				0x1736

#define USB_PID_ASUS_U3100				0x173f
@@ -158,7 +157,6 @@ 
#define USB_PID_CONCEPTRONIC_CTVDIGRCU			0xe397

#define USB_PID_CONEXANT_D680_DMB			0x86d6

#define USB_PID_CPYTO_REDI_PC50A			0xa803

#define USB_PID_CREATIX_CTX1921 			0x1921

#define USB_PID_CTVDIGDUAL_V2				0xe410

#define USB_PID_CYPRESS_DW2101				0x2101

#define USB_PID_CYPRESS_DW2102				0x2102
@@ -226,6 +224,7 @@ 
#define USB_PID_EMPIA_DIGIVOX_MINI_SL_WARM		0xe361

#define USB_PID_EMPIA_VSTREAM_COLD			0x17de

#define USB_PID_EMPIA_VSTREAM_WARM			0x17df

#define USB_PID_EVOLUTEPC_TVWAY_PLUS			0x0002

#define USB_PID_EVOLVEO_XTRATV_STICK			0xa115

#define USB_PID_FREECOM_DVBT				0x0160

#define USB_PID_FREECOM_DVBT_2				0x0161
@@ -288,10 +287,15 @@ 
#define USB_PID_KYE_DVB_T_COLD				0x701e

#define USB_PID_KYE_DVB_T_WARM				0x701f

#define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_COLD 	0x6025

#define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_H		0x60f6

#define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_STK7700P	0x6f00

#define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_STK7700P_2	0x6f01

#define USB_PID_LEADTEK_WINFAST_DTV_DONGLE_WARM 	0x6026

#define USB_PID_LITEON_DVB_T_COLD			0xf000

#define USB_PID_LITEON_DVB_T_WARM			0xf001

#define USB_PID_MEDION_CREATIX_CTX1921			0x1921

#define USB_PID_MEDION_MD95700				0x0932

#define USB_PID_MICROSOFT_XBOX_ONE_TUNER		0x02d5

#define USB_PID_MIGLIA_WT220U_ZAP250_COLD		0x0220

#define USB_PID_MSI_DIGIVOX_DUO 			0x8801

#define USB_PID_MSI_DIGI_VOX_MINI_III			0x8807
@@ -313,6 +317,9 @@ 
#define USB_PID_PCTV_200E				0x020e

#define USB_PID_PCTV_78E				0x025a

#define USB_PID_PCTV_79E				0x0262

#define USB_PID_PCTV_DIBCOM_STK8096PVR			0x1faa

#define USB_PID_PCTV_PINNACLE_PCTV282E			0x0248

#define USB_PID_PCTV_PINNACLE_PCTV73ESE 		0x0245

#define USB_PID_PINNACLE_EXPRESSCARD_320CX		0x022e

#define USB_PID_PINNACLE_PCTV2000E			0x022c

#define USB_PID_PINNACLE_PCTV282E			0x0248
@@ -408,10 +415,10 @@ 
#define USB_PID_TREKSTOR_DVBT				0x901b

#define USB_PID_TREKSTOR_TERRES_2_0			0xC803

#define USB_PID_TURBOX_DTT_2000 			0xd3a4

#define USB_PID_TVWAY_PLUS				0x0002

#define USB_PID_TWINHAN_VP7021_WARM			0x3208

#define USB_PID_TWINHAN_VP7041_COLD			0x3201

#define USB_PID_TWINHAN_VP7041_WARM			0x3202

#define USB_PID_ULTIMA_ARTEC_T14BR			0x810f

#define USB_PID_ULTIMA_ARTEC_T14_COLD			0x810b

#define USB_PID_ULTIMA_ARTEC_T14_WARM			0x810c

#define USB_PID_ULTIMA_TVBOX_AN2235_COLD		0x8107
@@ -450,13 +457,9 @@ 
#define USB_PID_WINFAST_DTV2000DS			0x6a04

#define USB_PID_WINFAST_DTV2000DS_PLUS			0x6f12

#define USB_PID_WINFAST_DTV_DONGLE_GOLD 		0x6029

#define USB_PID_WINFAST_DTV_DONGLE_H			0x60f6

#define USB_PID_WINFAST_DTV_DONGLE_MINID		0x6f0f

#define USB_PID_WINFAST_DTV_DONGLE_STK7700P		0x6f00

#define USB_PID_WINFAST_DTV_DONGLE_STK7700P_2		0x6f01

#define USB_PID_WINTV_SOLOHD				0x0264

#define USB_PID_WINTV_SOLOHD_2				0x8268

#define USB_PID_XBOX_ONE_TUNER				0x02d5

#define USB_PID_XTENSIONS_XD_380			0x0381

#define USB_PID_YUAN_EC372S				0x1edc

#define USB_PID_YUAN_MC770				0x0871