diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-oss.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-oss.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index 81732904623f..b5bede95dbf5 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: saa7134-oss.c,v 1.14 2005/05/18 22:45:16 hhackmann Exp $ | 2 | * $Id: saa7134-oss.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $ |
3 | * | 3 | * |
4 | * device driver for philips saa7134 based TV cards | 4 | * device driver for philips saa7134 based TV cards |
5 | * oss dsp interface | 5 | * oss dsp interface |
@@ -556,21 +556,28 @@ mixer_recsrc_7134(struct saa7134_dev *dev) | |||
556 | static int | 556 | static int |
557 | mixer_recsrc_7133(struct saa7134_dev *dev) | 557 | mixer_recsrc_7133(struct saa7134_dev *dev) |
558 | { | 558 | { |
559 | u32 value = 0xbbbbbb; | 559 | u32 anabar, xbarin; |
560 | 560 | ||
561 | xbarin = 0x03; // adc | ||
562 | anabar = 0; | ||
561 | switch (dev->oss.input) { | 563 | switch (dev->oss.input) { |
562 | case TV: | 564 | case TV: |
563 | value = 0xbbbb10; /* MAIN */ | 565 | xbarin = 0; // Demodulator |
566 | anabar = 2; // DACs | ||
564 | break; | 567 | break; |
565 | case LINE1: | 568 | case LINE1: |
566 | value = 0xbbbb32; /* AUX1 */ | 569 | anabar = 0; // aux1, aux1 |
567 | break; | 570 | break; |
568 | case LINE2: | 571 | case LINE2: |
569 | case LINE2_LEFT: | 572 | case LINE2_LEFT: |
570 | value = 0xbbbb54; /* AUX2 */ | 573 | anabar = 9; // aux2, aux2 |
571 | break; | 574 | break; |
572 | } | 575 | } |
573 | saa_dsp_writel(dev, 0x46c >> 2, value); | 576 | /* output xbar always main channel */ |
577 | saa_dsp_writel(dev, 0x46c >> 2, 0xbbbb10); | ||
578 | saa_dsp_writel(dev, 0x464 >> 2, xbarin); | ||
579 | saa_writel(0x594 >> 2, anabar); | ||
580 | |||
574 | return 0; | 581 | return 0; |
575 | } | 582 | } |
576 | 583 | ||