source: scripts/patches/linux-2.6.11-rc4-enable_dvico_dvb.patch@ cc0f174

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since cc0f174 was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move

  • Property mode set to 100644
File size: 3.5 KB
RevLine 
[617118d]1diff -ru linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-cards.c linux-2.6.11-rc4/drivers/media/video/cx88/cx88-cards.c
2--- linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-cards.c 2005-02-13 13:07:18.000000000 +1000
3+++ linux-2.6.11-rc4/drivers/media/video/cx88/cx88-cards.c 2005-02-15 08:15:47.000000000 +1000
4@@ -27,7 +27,12 @@
5 #include <linux/delay.h>
6
7 #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
8-# define WITH_DVB 1
9+/*
10+ * The Hauppauge and Conexant CX22702 based DVB-only cards enabled by this
11+ * are currently broken.
12+ *
13+ * # define WITH_DVB 1
14+ */
15 #endif
16
17 #include "cx88.h"
18@@ -840,12 +845,14 @@
19 leadtek_eeprom(core,eeprom);
20 break;
21 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
22- /* Tuner reset is hooked to the tuner out of reset */
23+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
24+ /* GPIO0:0 is hooked to mt352 reset pin */
25 cx_set(MO_GP0_IO, 0x00000101);
26 cx_clear(MO_GP0_IO, 0x00000001);
27 msleep(1);
28 cx_set(MO_GP0_IO, 0x00000101);
29 break;
30+#if 0
31 #ifdef WITH_DVB
32 case CX88_BOARD_HAUPPAUGE_DVB_T1:
33 if (0 == core->i2c_rc)
34@@ -858,6 +865,13 @@
35 core->demod_addr = 0x43;
36 break;
37 #endif
38+#else
39+ case CX88_BOARD_HAUPPAUGE_DVB_T1:
40+ case CX88_BOARD_CONEXANT_DVB_T1:
41+ printk(KERN_NOTICE "Hauppauge and Conexant DVB-T cards not supported "
42+ "in this release\n");
43+ break;
44+#endif
45 }
46 if (cx88_boards[core->board].radio.type == CX88_RADIO)
47 core->has_radio = 1;
48diff -ru linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-dvb.c linux-2.6.11-rc4/drivers/media/video/cx88/cx88-dvb.c
49--- linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-dvb.c 2005-02-13 13:06:55.000000000 +1000
50+++ linux-2.6.11-rc4/drivers/media/video/cx88/cx88-dvb.c 2005-02-15 08:10:48.000000000 +1000
51@@ -187,10 +187,15 @@
52 switch (dev->core->board) {
53 case CX88_BOARD_HAUPPAUGE_DVB_T1:
54 case CX88_BOARD_CONEXANT_DVB_T1:
55+#if 0
56 dev->dvb.frontend = cx22702_create(&dev->core->i2c_adap,
57 dev->core->pll_addr,
58 dev->core->pll_type,
59 dev->core->demod_addr);
60+#else
61+ printk(KERN_NOTICE "Hauppauge and Conexant DVB-T cards not supported "
62+ "in this release\n");
63+#endif
64 break;
65 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
66 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dvbt1,
67@@ -222,7 +227,7 @@
68 sizeof(dev->dvb.frontend->ops->info.name));
69
70 /* register everything */
71- return videobuf_dvb_register(&dev->dvb);
72+ return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
73 }
74
75 /* ----------------------------------------------------------- */
76diff -ru linux-2.6.11-rc4.clean/drivers/media/video/Kconfig linux-2.6.11-rc4/drivers/media/video/Kconfig
77--- linux-2.6.11-rc4.clean/drivers/media/video/Kconfig 2005-02-13 13:07:40.000000000 +1000
78+++ linux-2.6.11-rc4/drivers/media/video/Kconfig 2005-02-15 08:20:46.000000000 +1000
79@@ -305,7 +305,7 @@
80
81 config VIDEO_CX88
82 tristate "Conexant 2388x (bt878 successor) support"
83- depends on VIDEO_DEV && PCI && EXPERIMENTAL
84+ depends on VIDEO_DEV && PCI && I2C && EXPERIMENTAL
85 select I2C_ALGOBIT
86 select VIDEO_BTCX
87 select VIDEO_BUF
88@@ -319,12 +319,15 @@
89
90 config VIDEO_CX88_DVB
91 tristate "DVB Support for cx2388x based TV cards"
92- depends on VIDEO_CX88 && DVB_CORE && BROKEN
93+ depends on VIDEO_CX88 && DVB_CORE
94 select VIDEO_BUF_DVB
95+ select DVB_MT352
96 ---help---
97 This adds support for DVB cards based on the
98 Connexant 2388x chip.
99
100+ As of this release only the DVICO DVB-T cards are supported.
101+
102 config VIDEO_OVCAMCHIP
103 tristate "OmniVision Camera Chip support"
104 depends on VIDEO_DEV && I2C
Note: See TracBrowser for help on using the repository browser.