提交 95efa03b 编写于 作者: M Mauro Carvalho Chehab

V4L/DVB (5012a): Remove some unused code from kernel mainstream


There are some long time unused code under some media driver source files. 
There's no need of keeping it at mainstream.
Those unused code will remain available at V4L/DVB master tree and also at
kernel history.
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 d9bdf772
...@@ -578,14 +578,9 @@ struct tvcard bttv_tvcards[] = { ...@@ -578,14 +578,9 @@ struct tvcard bttv_tvcards[] = {
.svhs = 2, .svhs = 2,
.gpiomask = 0x01fe00, .gpiomask = 0x01fe00,
.muxsel = { 2, 3, 1, 1 }, .muxsel = { 2, 3, 1, 1 },
#if 0
/* old */
.gpiomux = { 0x01c000, 0, 0x018000, 0x014000, 0x002000 },
#else
/* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */ /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
.gpiomux = { 0x001e00, 0, 0x018000, 0x014000 }, .gpiomux = { 0x001e00, 0, 0x018000, 0x014000 },
.gpiomute = 0x002000, .gpiomute = 0x002000,
#endif
.needs_tvaudio = 1, .needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = -1, .tuner_type = -1,
...@@ -894,15 +889,10 @@ struct tvcard bttv_tvcards[] = { ...@@ -894,15 +889,10 @@ struct tvcard bttv_tvcards[] = {
.tuner = 0, .tuner = 0,
.svhs = 2, .svhs = 2,
.muxsel = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */ .muxsel = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */
#if 0
.gpiomask = 0xc33000,
.gpiomux = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
#else
/* Alexander Varakin <avarakin@hotmail.com> [stereo version] */ /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
.gpiomask = 0xb33000, .gpiomask = 0xb33000,
.gpiomux = { 0x122000,0x1000,0x0000,0x620000 }, .gpiomux = { 0x122000,0x1000,0x0000,0x620000 },
.gpiomute = 0x800000, .gpiomute = 0x800000,
#endif
/* Audio Routing for "WinFast 2000 XP" (no tv stereo !) /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
gpio23 -- hef4052:nEnable (0x800000) gpio23 -- hef4052:nEnable (0x800000)
gpio12 -- hef4052:A1 gpio12 -- hef4052:A1
...@@ -1937,11 +1927,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1937,11 +1927,6 @@ struct tvcard bttv_tvcards[] = {
.video_inputs = 4, .video_inputs = 4,
.audio_inputs = 1, .audio_inputs = 1,
.tuner = -1, .tuner = -1,
#if 0 /* TODO ... */
.svhs = OSPREY540_SVID_ANALOG,
.muxsel = { [OSPREY540_COMP_ANALOG] = 2,
[OSPREY540_SVID_ANALOG] = 3, },
#endif
.pll = PLL_28, .pll = PLL_28,
.tuner_type = -1, .tuner_type = -1,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1949,10 +1934,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1949,10 +1934,6 @@ struct tvcard bttv_tvcards[] = {
.no_msp34xx = 1, .no_msp34xx = 1,
.no_tda9875 = 1, .no_tda9875 = 1,
.no_tda7432 = 1, .no_tda7432 = 1,
#if 0 /* TODO ... */
.muxsel_hook = osprey_540_muxsel,
.picture_hook = osprey_540_set_picture,
#endif
}, },
/* ---- card 0x5C ---------------------------------- */ /* ---- card 0x5C ---------------------------------- */
...@@ -2627,9 +2608,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2627,9 +2608,6 @@ struct tvcard bttv_tvcards[] = {
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
.has_radio = 0, .has_radio = 0,
#if 0
.has_remote = 1,
#endif
}, },
[BTTV_BOARD_SUPER_TV] = { [BTTV_BOARD_SUPER_TV] = {
/* Rick C <cryptdragoon@gmail.com> */ /* Rick C <cryptdragoon@gmail.com> */
......
...@@ -797,55 +797,6 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t) ...@@ -797,55 +797,6 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
Add some code here later. Add some code here later.
*/ */
# if 0
t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP |
V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
t->rxsubchans = V4L2_TUNER_SUB_MONO;
t->audmode = V4L2_TUNER_MODE_MONO;
switch (core->tvaudio) {
case WW_BTSC:
t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP;
t->rxsubchans = V4L2_TUNER_SUB_STEREO;
if (1 == pilot) {
/* SAP */
t->rxsubchans |= V4L2_TUNER_SUB_SAP;
}
break;
case WW_A2_BG:
case WW_A2_DK:
case WW_A2_M:
if (1 == pilot) {
/* stereo */
t->rxsubchans =
V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
if (0 == mode)
t->audmode = V4L2_TUNER_MODE_STEREO;
}
if (2 == pilot) {
/* dual language -- FIXME */
t->rxsubchans =
V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
t->audmode = V4L2_TUNER_MODE_LANG1;
}
break;
case WW_NICAM_BGDKL:
if (0 == mode) {
t->audmode = V4L2_TUNER_MODE_STEREO;
t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
}
break;
case WW_SYSTEM_L_AM:
if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) {
t->audmode = V4L2_TUNER_MODE_STEREO;
t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
}
break;
default:
/* nothing */
break;
}
# endif
return; return;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册