leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (3293): Fixed amux hauppauge hvr900/terratec hybrid xs

Browse Source 
Fixed amux hauppauge hvr900/terratec hybrid xs

Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Markus Rechberger 2006-02-27 00:07:34 -03:00 committed by Mauro Carvalho Chehab
parent cce91e36d7
commit 9475fb1c71
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/em28xx/em28xx-cards.c
View File

@ -101,7 +101,7 @@ struct em28xx_board em28xx_boards[] = {
.input = {{ .input = {{
.type = EM28XX_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 1,
},{ },{
.type = EM28XX_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
@ -165,11 +165,11 @@ struct em28xx_board em28xx_boards[] = {
.input = {{ .input = {{
.type = EM28XX_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 1,
},{ },{
.type = EM28XX_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 0,
},{ },{
.type = EM28XX_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
@ -185,12 +185,12 @@ struct em28xx_board em28xx_boards[] = {
.tuner_type = TUNER_XCEIVE_XC3028, .tuner_type = TUNER_XCEIVE_XC3028,
.decoder = EM28XX_TVP5150, .decoder = EM28XX_TVP5150,
.input = {{ .input = {{
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = 2,
.amux = 0,
},{
.type = EM28XX_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = 2,
.amux = 1, .amux = 1,
},{ },{
.type = EM28XX_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,

14
drivers/media/video/em28xx/em28xx-video.c
View File

@ -222,8 +222,8 @@ static int em28xx_config(struct em28xx *dev)
/* enable vbi capturing */ /* enable vbi capturing */
em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); /* em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); audio register */
em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); /* em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); clk register */
em28xx_write_regs_req(dev,0x00,0x11,"\x51",1); em28xx_write_regs_req(dev,0x00,0x11,"\x51",1);
em28xx_audio_usb_mute(dev, 1); em28xx_audio_usb_mute(dev, 1);
@ -313,11 +313,11 @@ static void video_mux(struct em28xx *dev, int index)
em28xx_audio_source(dev, ainput); em28xx_audio_source(dev, ainput);
} else { } else {
switch (dev->ctl_ainput) { switch (dev->ctl_ainput) {
case 0: case 0:
ainput = EM28XX_AUDIO_SRC_TUNER; ainput = EM28XX_AUDIO_SRC_TUNER;
break; break;
default: default:
ainput = EM28XX_AUDIO_SRC_LINE; ainput = EM28XX_AUDIO_SRC_LINE;
} }
em28xx_audio_source(dev, ainput); em28xx_audio_source(dev, ainput);
} }