diff options
| author | Gerd Knorr <devnull@localhost> | 2004-04-01 11:51:45 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-04-01 11:51:45 +0000 |
| commit | 15b1e074f44b3811d39ec1caf15df0ae4c15a3c3 (patch) | |
| tree | c9aab087093e025a120a191356856279a182b4df | |
| parent | ef718af6bad86a546e1670c7dbbf09b550a03e8b (diff) | |
| download | mediapointer-dvb-s2-15b1e074f44b3811d39ec1caf15df0ae4c15a3c3.tar.gz mediapointer-dvb-s2-15b1e074f44b3811d39ec1caf15df0ae4c15a3c3.tar.bz2 | |
- fix tuner for saa7133 asus board.
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index e668253e1..fc5c1cf2d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -506,8 +506,6 @@ struct saa7134_board saa7134_boards[] = { }}, }, [SAA7134_BOARD_ASUSTeK_TVFM7134] = { - // NTSC versions of the card seem to have - // TUNER_LG_NTSC_NEW_TAPC (39) .name = "ASUS TV-FM 7134", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, @@ -734,7 +732,9 @@ struct saa7134_board saa7134_boards[] = { [SAA7134_BOARD_ASUSTEK_TVFM7133] = { .name = "ASUS TV-FM 7133", .audio_clock = 0x00187de7, - .tuner_type = TUNER_PHILIPS_FM1236_MK3, + // probably wrong, the 7133 one is the NTSC version ... + // .tuner_type = TUNER_PHILIPS_FM1236_MK3 + .tuner_type = TUNER_LG_NTSC_NEW_TAPC, .need_tda9887 = 1, .inputs = {{ .name = name_tv, diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index a6caeae21..8ec5ed0c4 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -60,8 +60,9 @@ MODULE_PARM_DESC(audio_clock_tweak, "Audio clock tick fine tuning for cards with #define print_regb(reg) printk("%s: reg 0x%03x [%-16s]: 0x%02x\n", \ dev->name,(SAA7134_##reg),(#reg),saa_readb((SAA7134_##reg))) -#define SCAN_INITIAL_DELAY (HZ) -#define SCAN_SAMPLE_DELAY (HZ/5) +#define SCAN_INITIAL_DELAY (HZ) +#define SCAN_SAMPLE_DELAY (HZ/5) +#define SCAN_SUBCARRIER_DELAY (HZ*2) /* ------------------------------------------------------------------ */ /* saa7134 code */ @@ -565,7 +566,7 @@ static int tvaudio_thread(void *data) if (UNSET == audio) audio = i; tvaudio_setmode(dev,&tvaudio[i],"trying"); - if (tvaudio_sleep(dev,HZ*2)) + if (tvaudio_sleep(dev,SCAN_SUBCARRIER_DELAY)) goto restart; if (-1 != tvaudio_getstereo(dev,&tvaudio[i])) { audio = i; |