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
1771 PROF_7500,1771 PROF_7500,
1772 GENIATECH_SU3000,1772 GENIATECH_SU3000,
1773 HAUPPAUGE_MAX_S2,1773 HAUPPAUGE_MAX_S2,
1774 TERRATEC_CINERGY_S2,1774 TERRATEC_CINERGY_S2_R1,
1775 TEVII_S480_1,1775 TEVII_S480_1,
1776 TEVII_S480_2,1776 TEVII_S480_2,
1777 X3M_SPC1400HD,1777 GENIATECH_X3M_SPC1400HD,
1778 TEVII_S421,1778 TEVII_S421,
1779 TEVII_S632,1779 TEVII_S632,
1780 TERRATEC_CINERGY_S2_R2,1780 TERRATEC_CINERGY_S2_R2,
@@ -1784,7 +1784,7 @@ enum dw2102_table_entry { · 3 unmodified lines
1784 TERRATEC_CINERGY_S2_2,1784 TERRATEC_CINERGY_S2_2,
1785 GOTVIEW_SAT_HD,1785 GOTVIEW_SAT_HD,
1786 GENIATECH_T220,1786 GENIATECH_T220,
1787 TECHNOTREND_S2_4600,1787 TECHNOTREND_CONNECT_S2_4600,
1788 TEVII_S482_1,1788 TEVII_S482_1,
1789 TEVII_S482_2,1789 TEVII_S482_2,
1790 TERRATEC_CINERGY_S2_BOX,1790 TERRATEC_CINERGY_S2_BOX,
@@ -1792,42 +1792,36 @@ enum dw2102_table_entry { · 1 unmodified line
1792};1792};
1793 1793
1794static struct usb_device_id dw2102_table[] = {1794static struct usb_device_id dw2102_table[] = {
1795 [CYPRESS_DW2102] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},1795 DVB_USB_DEV(CYPRESS, CYPRESS_DW2102),
1796 [CYPRESS_DW2101] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2101)},1796 DVB_USB_DEV(CYPRESS, CYPRESS_DW2101),
1797 [CYPRESS_DW2104] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2104)},1797 DVB_USB_DEV(CYPRESS, CYPRESS_DW2104),
1798 [TEVII_S650] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S650)},1798 DVB_USB_DEV(TEVII, TEVII_S650),
1799 [TERRATEC_CINERGY_S] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S)},1799 DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S),
1800 [CYPRESS_DW3101] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},1800 DVB_USB_DEV(CYPRESS, CYPRESS_DW3101),
1801 [TEVII_S630] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S630)},1801 DVB_USB_DEV(TEVII, TEVII_S630),
1802 [PROF_1100] = {USB_DEVICE(USB_VID_PROF_1, USB_PID_PROF_1100)},1802 DVB_USB_DEV(PROF_1, PROF_1100),
1803 [TEVII_S660] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S660)},1803 DVB_USB_DEV(TEVII, TEVII_S660),
1804 [PROF_7500] = {USB_DEVICE(USB_VID_PROF_2, USB_PID_PROF_7500)},1804 DVB_USB_DEV(PROF_2, PROF_7500),
1805 [GENIATECH_SU3000] = {USB_DEVICE(USB_VID_GTEK, USB_PID_GENIATECH_SU3000)},1805 DVB_USB_DEV(GTEK, GENIATECH_SU3000),
1806 [HAUPPAUGE_MAX_S2] = {USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MAX_S2)},1806 DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_MAX_S2),
1807 [TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R1)},1807 DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R1),
1808 [TEVII_S480_1] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S480_1)},1808 DVB_USB_DEV(TEVII, TEVII_S480_1),
1809 [TEVII_S480_2] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S480_2)},1809 DVB_USB_DEV(TEVII, TEVII_S480_2),
1810 [X3M_SPC1400HD] = {USB_DEVICE(USB_VID_GTEK, USB_PID_GENIATECH_X3M_SPC1400HD)},1810 DVB_USB_DEV(GTEK, GENIATECH_X3M_SPC1400HD),
1811 [TEVII_S421] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S421)},1811 DVB_USB_DEV(TEVII, TEVII_S421),
1812 [TEVII_S632] = {USB_DEVICE(USB_VID_TEVII, USB_PID_TEVII_S632)},1812 DVB_USB_DEV(TEVII, TEVII_S632),
1813 [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC,1813 DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R2),
1814 USB_PID_TERRATEC_CINERGY_S2_R2)},1814 DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R3),
1815 [TERRATEC_CINERGY_S2_R3] = {USB_DEVICE(USB_VID_TERRATEC,1815 DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_R4),
1816 USB_PID_TERRATEC_CINERGY_S2_R3)},1816 DVB_USB_DEV(TERRATEC_2, TERRATEC_CINERGY_S2_1),
1817 [TERRATEC_CINERGY_S2_R4] = {USB_DEVICE(USB_VID_TERRATEC,1817 DVB_USB_DEV(TERRATEC_2, TERRATEC_CINERGY_S2_2),
1818 USB_PID_TERRATEC_CINERGY_S2_R4)},1818 DVB_USB_DEV(GOTVIEW, GOTVIEW_SAT_HD),
1819 [TERRATEC_CINERGY_S2_1] = {USB_DEVICE(USB_VID_TERRATEC_2,1819 DVB_USB_DEV(GTEK, GENIATECH_T220),
1820 USB_PID_TERRATEC_CINERGY_S2_1)},1820 DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_4600),
1821 [TERRATEC_CINERGY_S2_2] = {USB_DEVICE(USB_VID_TERRATEC_2,1821 DVB_USB_DEV(TEVII, TEVII_S482_1),
1822 USB_PID_TERRATEC_CINERGY_S2_2)},1822 DVB_USB_DEV(TEVII, TEVII_S482_2),
1823 [GOTVIEW_SAT_HD] = {USB_DEVICE(USB_VID_GOTVIEW, USB_PID_GOTVIEW_SAT_HD)},1823 DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_BOX),
1824 [GENIATECH_T220] = {USB_DEVICE(USB_VID_GTEK, USB_PID_GENIATECH_T220)},1824 DVB_USB_DEV(TEVII, TEVII_S662),
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)},
1831 { }1825 { }
1832};1826};
1833 1827
@@ -1889,18 +1883,18 @@ static int dw2102_load_firmware(struct usb_device *dev, · 55 unmodified lines
1889 case USB_PID_TEVII_S650:1883 case USB_PID_TEVII_S650:
1890 dw2104_properties.rc.core.rc_codes = RC_MAP_TEVII_NEC;1884 dw2104_properties.rc.core.rc_codes = RC_MAP_TEVII_NEC;
1891 fallthrough;1885 fallthrough;
1892 case USB_PID_DW2104:1886 case USB_PID_CYPRESS_DW2104:
1893 reset = 1;1887 reset = 1;
1894 dw210x_op_rw(dev, 0xc4, 0x0000, 0, &reset, 1,1888 dw210x_op_rw(dev, 0xc4, 0x0000, 0, &reset, 1,
1895 DW210X_WRITE_MSG);1889 DW210X_WRITE_MSG);
1896 fallthrough;1890 fallthrough;
1897 case USB_PID_DW3101:1891 case USB_PID_CYPRESS_DW3101:
1898 reset = 0;1892 reset = 0;
1899 dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,1893 dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
1900 DW210X_WRITE_MSG);1894 DW210X_WRITE_MSG);
1901 break;1895 break;
1902 case USB_PID_TERRATEC_CINERGY_S:1896 case USB_PID_TERRATEC_CINERGY_S:
1903 case USB_PID_DW2102:1897 case USB_PID_CYPRESS_DW2102:
1904 dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,1898 dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
1905 DW210X_WRITE_MSG);1899 DW210X_WRITE_MSG);
1906 dw210x_op_rw(dev, 0xb9, 0x0000, 0, &reset16[0], 2,1900 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
2350 { NULL },2344 { NULL },
2351 },2345 },
2352 { "Terratec Cinergy S2 USB HD",2346 { "Terratec Cinergy S2 USB HD",
2353 { &dw2102_table[TERRATEC_CINERGY_S2], NULL },2347 { &dw2102_table[TERRATEC_CINERGY_S2_R1], NULL },
2354 { NULL },2348 { NULL },
2355 },2349 },
2356 { "X3M TV SPC1400HD PCI",2350 { "X3M TV SPC1400HD PCI",
2357 { &dw2102_table[X3M_SPC1400HD], NULL },2351 { &dw2102_table[GENIATECH_X3M_SPC1400HD], NULL },
2358 { NULL },2352 { NULL },
2359 },2353 },
2360 { "Terratec Cinergy S2 USB HD Rev.2",2354 { "Terratec Cinergy S2 USB HD Rev.2",
@@ -2525,7 +2519,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = { · 164 unmodified lines
2525 .num_device_descs = 5,2519 .num_device_descs = 5,
2526 .devices = {2520 .devices = {
2527 { "TechnoTrend TT-connect S2-4600",2521 { "TechnoTrend TT-connect S2-4600",
2528 { &dw2102_table[TECHNOTREND_S2_4600], NULL },2522 { &dw2102_table[TECHNOTREND_CONNECT_S2_4600], NULL },
2529 { NULL },2523 { NULL },
2530 },2524 },
2531 { "TeVii S482 (tuner 1)",2525 { "TeVii S482 (tuner 1)",
include/media/dvb-usb-ids.h+6−6
@@ -160,6 +160,10 @@ · 159 unmodified lines
160#define USB_PID_CPYTO_REDI_PC50A 0xa803160#define USB_PID_CPYTO_REDI_PC50A 0xa803
161#define USB_PID_CREATIX_CTX1921 0x1921161#define USB_PID_CREATIX_CTX1921 0x1921
162#define USB_PID_CTVDIGDUAL_V2 0xe410162#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
163#define USB_PID_DELOCK_USB2_DVBT 0xb803167#define USB_PID_DELOCK_USB2_DVBT 0xb803
164#define USB_PID_DIBCOM_ANCHOR_2135_COLD 0x2131168#define USB_PID_DIBCOM_ANCHOR_2135_COLD 0x2131
165#define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064169#define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064
@@ -211,10 +215,6 @@ · 45 unmodified lines
211#define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM 0xdb01215#define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM 0xdb01
212#define USB_PID_DVICO_BLUEBIRD_TH7579_COLD 0xdb10216#define USB_PID_DVICO_BLUEBIRD_TH7579_COLD 0xdb10
213#define USB_PID_DVICO_BLUEBIRD_TH7579_WARM 0xdb11217#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
218#define USB_PID_E3C_EC168 0x1689218#define USB_PID_E3C_EC168 0x1689
219#define USB_PID_E3C_EC168_2 0xfffa219#define USB_PID_E3C_EC168_2 0xfffa
220#define USB_PID_E3C_EC168_3 0xfffb220#define USB_PID_E3C_EC168_3 0xfffb
@@ -394,6 +394,8 @@ · 173 unmodified lines
394#define USB_PID_TEVII_S421 0xd421394#define USB_PID_TEVII_S421 0xd421
395#define USB_PID_TEVII_S480_1 0xd481395#define USB_PID_TEVII_S480_1 0xd481
396#define USB_PID_TEVII_S480_2 0xd482396#define USB_PID_TEVII_S480_2 0xd482
397#define USB_PID_TEVII_S482_1 0xd483
398#define USB_PID_TEVII_S482_2 0xd484
397#define USB_PID_TEVII_S630 0xd630399#define USB_PID_TEVII_S630 0xd630
398#define USB_PID_TEVII_S632 0xd632400#define USB_PID_TEVII_S632 0xd632
399#define USB_PID_TEVII_S650 0xd650401#define USB_PID_TEVII_S650 0xd650
@@ -404,8 +406,6 @@ · 4 unmodified lines
404#define USB_PID_TINYTWIN_3 0x9016406#define USB_PID_TINYTWIN_3 0x9016
405#define USB_PID_TREKSTOR_DVBT 0x901b407#define USB_PID_TREKSTOR_DVBT 0x901b
406#define USB_PID_TREKSTOR_TERRES_2_0 0xC803408#define USB_PID_TREKSTOR_TERRES_2_0 0xC803
407#define USB_PID_TTEVII_S482_1 0xd483
408#define USB_PID_TTEVII_S482_2 0xd484
409#define USB_PID_TURBOX_DTT_2000 0xd3a4409#define USB_PID_TURBOX_DTT_2000 0xd3a4
410#define USB_PID_TVWAY_PLUS 0x0002410#define USB_PID_TVWAY_PLUS 0x0002
411#define USB_PID_TWINHAN_VP7020_COLD 0x3203411#define USB_PID_TWINHAN_VP7020_COLD 0x3203