History

media: dw2102: use the newer dvb-usb macros for USB device

In order to make the drivers under dvb-usb more homogeneous, use the new macro, and rename some PIDs.

Mauro Carvalho Chehab committed 4 years ago

Commit 2fa20021 parent 4a307b42 files · +45 −51Browse files

Unified · Split

2 files
  1. drivers/media/usb/dvb-usb/dw2102.c +39 −45
  2. include/media/dvb-usb-ids.h +6 −6
drivers/media/usb/dvb-usb/dw2102.c+39−45
@@ -1771,10 +1771,10 @@ enum dw2102_table_entry { · 1770 unmodified lines
17711771 PROF_7500,
17721772 GENIATECH_SU3000,
17731773 HAUPPAUGE_MAX_S2,
1774− TERRATEC_CINERGY_S2,
1774+ TERRATEC_CINERGY_S2_R1,
17751775 TEVII_S480_1,
17761776 TEVII_S480_2,
1777− X3M_SPC1400HD,
1777+ GENIATECH_X3M_SPC1400HD,
17781778 TEVII_S421,
17791779 TEVII_S632,
17801780 TERRATEC_CINERGY_S2_R2,
@@ -1784,7 +1784,7 @@ enum dw2102_table_entry { · 3 unmodified lines
17841784 TERRATEC_CINERGY_S2_2,
17851785 GOTVIEW_SAT_HD,
17861786 GENIATECH_T220,
1787− TECHNOTREND_S2_4600,
1787+ TECHNOTREND_CONNECT_S2_4600,
17881788 TEVII_S482_1,
17891789 TEVII_S482_2,
17901790 TERRATEC_CINERGY_S2_BOX,
@@ -1792,42 +1792,36 @@ enum dw2102_table_entry { · 1 unmodified line
17921792 };
17931793
17941794 static struct usb_device_id dw2102_table[] = {
1795− [CYPRESS_DW2102] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},
1796− [CYPRESS_DW2101] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2101)},
1797− [CYPRESS_DW2104] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2104)},
1798− [TEVII_S650] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S650)},
1799− [TERRATEC_CINERGY_S] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S)},
1800− [CYPRESS_DW3101] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},
1801− [TEVII_S630] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S630)},
1802− [PROF_1100] = {USB_DEVICE(USB_VID_PROF_1, USB_PID_PROF_1100)},
1803− [TEVII_S660] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S660)},
1804− [PROF_7500] = {USB_DEVICE(USB_VID_PROF_2, USB_PID_PROF_7500)},
1805− [GENIATECH_SU3000] = {USB_DEVICE(USB_VID_GTEK, USB_PID_GENIATECH_SU3000)},
1806− [HAUPPAUGE_MAX_S2] = {USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MAX_S2)},
1807− [TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R1)},
1808− [TEVII_S480_1] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S480_1)},
1809− [TEVII_S480_2] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S480_2)},
1810− [X3M_SPC1400HD] = {USB_DEVICE(USB_VID_GTEK, USB_PID_GENIATECH_X3M_SPC1400HD)},
1811− [TEVII_S421] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S421)},
1812− [TEVII_S632] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S632)},
1813− [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC,
1814− USB_PID_TERRATEC_CINERGY_S2_R2)},
1815− [TERRATEC_CINERGY_S2_R3] = {USB_DEVICE(USB_VID_TERRATEC,
1816− USB_PID_TERRATEC_CINERGY_S2_R3)},
1817− [TERRATEC_CINERGY_S2_R4] = {USB_DEVICE(USB_VID_TERRATEC,
1818− USB_PID_TERRATEC_CINERGY_S2_R4)},
1819− [TERRATEC_CINERGY_S2_1] = {USB_DEVICE(USB_VID_TERRATEC_2,
1820− USB_PID_TERRATEC_CINERGY_S2_1)},
1821− [TERRATEC_CINERGY_S2_2] = {USB_DEVICE(USB_VID_TERRATEC_2,
1822− USB_PID_TERRATEC_CINERGY_S2_2)},
1823− [GOTVIEW_SAT_HD] = {USB_DEVICE(USB_VID_GOTVIEW, USB_PID_GOTVIEW_SAT_HD)},
1824− [GENIATECH_T220] = {USB_DEVICE(USB_VID_GTEK, USB_PID_GENIATECH_T220)},
1825− [TECHNOTREND_S2_4600] = {USB_DEVICE(USB_VID_TECHNOTREND,
1826− USB_PID_TECHNOTREND_CONNECT_S2_4600)},
1827− [TEVII_S482_1] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TTEVII_S482_1)},
1828− [TEVII_S482_2] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TTEVII_S482_2)},
1829− [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_BOX)},
1830− [TEVII_S662] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S662)},
1795+ DVB_USB_DEV(CYPRESS, CYPRESS_DW2102),
1796+ DVB_USB_DEV(CYPRESS, CYPRESS_DW2101),
1797+ DVB_USB_DEV(CYPRESS, CYPRESS_DW2104),
1798+ DVB_USB_DEV(TEVII, TEVII_S650),
1799+ DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S),
1800+ DVB_USB_DEV(CYPRESS, CYPRESS_DW3101),
1801+ DVB_USB_DEV(TEVII, TEVII_S630),
1802+ DVB_USB_DEV(PROF_1, PROF_1100),
1803+ DVB_USB_DEV(TEVII, TEVII_S660),
1804+ DVB_USB_DEV(PROF_2, PROF_7500),
1805+ DVB_USB_DEV(GTEK, GENIATECH_SU3000),
1806+ DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_MAX_S2),
1807+ DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R1),
1808+ DVB_USB_DEV(TEVII, TEVII_S480_1),
1809+ DVB_USB_DEV(TEVII, TEVII_S480_2),
1810+ DVB_USB_DEV(GTEK, GENIATECH_X3M_SPC1400HD),
1811+ DVB_USB_DEV(TEVII, TEVII_S421),
1812+ DVB_USB_DEV(TEVII, TEVII_S632),
1813+ DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R2),
1814+ DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R3),
1815+ DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R4),
1816+ DVB_USB_DEV(TERRATEC_2, TERRATEC_CINERGY_S2_1),
1817+ DVB_USB_DEV(TERRATEC_2, TERRATEC_CINERGY_S2_2),
1818+ DVB_USB_DEV(GOTVIEW, GOTVIEW_SAT_HD),
1819+ DVB_USB_DEV(GTEK, GENIATECH_T220),
1820+ DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_4600),
1821+ DVB_USB_DEV(TEVII, TEVII_S482_1),
1822+ DVB_USB_DEV(TEVII, TEVII_S482_2),
1823+ DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_BOX),
1824+ DVB_USB_DEV(TEVII, TEVII_S662),
18311825 { }
18321826 };
18331827
@@ -1889,18 +1883,18 @@ static int dw2102_load_firmware(struct usb_device *dev, · 55 unmodified lines
18891883 case USB_PID_TEVII_S650:
18901884 dw2104_properties.rc.core.rc_codes = RC_MAP_TEVII_NEC;
18911885 fallthrough;
1892− case USB_PID_DW2104:
1886+ case USB_PID_CYPRESS_DW2104:
18931887 reset = 1;
18941888 dw210x_op_rw(dev, 0xc4, 0x0000, 0, &reset, 1,
18951889 DW210X_WRITE_MSG);
18961890 fallthrough;
1897− case USB_PID_DW3101:
1891+ case USB_PID_CYPRESS_DW3101:
18981892 reset = 0;
18991893 dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
19001894 DW210X_WRITE_MSG);
19011895 break;
19021896 case USB_PID_TERRATEC_CINERGY_S:
1903− case USB_PID_DW2102:
1897+ case USB_PID_CYPRESS_DW2102:
19041898 dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
19051899 DW210X_WRITE_MSG);
19061900 dw210x_op_rw(dev, 0xb9, 0x0000, 0, &reset16[0], 2,
@@ -2350,11 +2344,11 @@ static struct dvb_usb_device_properties su3000_properties = { · 443 unmodified lines
23502344 { NULL },
23512345 },
23522346 { "Terratec Cinergy S2 USB HD",
2353− { &dw2102_table[TERRATEC_CINERGY_S2], NULL },
2347+ { &dw2102_table[TERRATEC_CINERGY_S2_R1], NULL },
23542348 { NULL },
23552349 },
23562350 { "X3M TV SPC1400HD PCI",
2357− { &dw2102_table[X3M_SPC1400HD], NULL },
2351+ { &dw2102_table[GENIATECH_X3M_SPC1400HD], NULL },
23582352 { NULL },
23592353 },
23602354 { "Terratec Cinergy S2 USB HD Rev.2",
@@ -2525,7 +2519,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = { · 164 unmodified lines
25252519 .num_device_descs = 5,
25262520 .devices = {
25272521 { "TechnoTrend TT-connect S2-4600",
2528− { &dw2102_table[TECHNOTREND_S2_4600], NULL },
2522+ { &dw2102_table[TECHNOTREND_CONNECT_S2_4600], NULL },
25292523 { NULL },
25302524 },
25312525 { "TeVii S482 (tuner 1)",
include/media/dvb-usb-ids.h+6−6
@@ -160,6 +160,10 @@ · 159 unmodified lines
160160 #define USB_PID_CPYTO_REDI_PC50A 0xa803
161161 #define USB_PID_CREATIX_CTX1921 0x1921
162162 #define USB_PID_CTVDIGDUAL_V2 0xe410
163+#define USB_PID_CYPRESS_DW2101 0x2101
164+#define USB_PID_CYPRESS_DW2102 0x2102
165+#define USB_PID_CYPRESS_DW2104 0x2104
166+#define USB_PID_CYPRESS_DW3101 0x3101
163167 #define USB_PID_DELOCK_USB2_DVBT 0xb803
164168 #define USB_PID_DIBCOM_ANCHOR_2135_COLD 0x2131
165169 #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064
@@ -211,10 +215,6 @@ · 45 unmodified lines
211215 #define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM 0xdb01
212216 #define USB_PID_DVICO_BLUEBIRD_TH7579_COLD 0xdb10
213217 #define USB_PID_DVICO_BLUEBIRD_TH7579_WARM 0xdb11
214−#define USB_PID_DW2101 0x2101
215−#define USB_PID_DW2102 0x2102
216−#define USB_PID_DW2104 0x2104
217−#define USB_PID_DW3101 0x3101
218218 #define USB_PID_E3C_EC168 0x1689
219219 #define USB_PID_E3C_EC168_2 0xfffa
220220 #define USB_PID_E3C_EC168_3 0xfffb
@@ -394,6 +394,8 @@ · 173 unmodified lines
394394 #define USB_PID_TEVII_S421 0xd421
395395 #define USB_PID_TEVII_S480_1 0xd481
396396 #define USB_PID_TEVII_S480_2 0xd482
397+#define USB_PID_TEVII_S482_1 0xd483
398+#define USB_PID_TEVII_S482_2 0xd484
397399 #define USB_PID_TEVII_S630 0xd630
398400 #define USB_PID_TEVII_S632 0xd632
399401 #define USB_PID_TEVII_S650 0xd650
@@ -404,8 +406,6 @@ · 4 unmodified lines
404406 #define USB_PID_TINYTWIN_3 0x9016
405407 #define USB_PID_TREKSTOR_DVBT 0x901b
406408 #define USB_PID_TREKSTOR_TERRES_2_0 0xC803
407−#define USB_PID_TTEVII_S482_1 0xd483
408−#define USB_PID_TTEVII_S482_2 0xd484
409409 #define USB_PID_TURBOX_DTT_2000 0xd3a4
410410 #define USB_PID_TVWAY_PLUS 0x0002
411411 #define USB_PID_TWINHAN_VP7020_COLD 0x3203