diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
3 files changed, 15 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index be6862af7..3eb04df49 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.72 2005/06/22 22:31:38 nsh Exp $ + * $Id: saa7134-cards.c,v 1.73 2005/06/22 23:37:34 nsh Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -842,7 +842,7 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2, .gpio = 0x08c20012, .tv = 1, - }}, + }}, /* radio and probably mute is missing */ }, [SAA7134_BOARD_CRONOS_PLUS] = { /* @@ -1351,8 +1351,7 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2_LEFT, .tv = 1, .gpio = 0x00080, - }}, - + }}, .radio = { .name = name_radio, .amux = LINE2, @@ -1624,7 +1623,7 @@ struct saa7134_board saa7134_boards[] = { /* Dylan Walkden <dylan_walkden@hotmail.com> */ .name = "Compro VideoMate Gold+ Pal", .audio_clock = 0x00187de7, - .tuner_type = TUNER_PHILIPS_NTSC_M, + .tuner_type = TUNER_PHILIPS_PAL, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, @@ -2474,6 +2473,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) case SAA7134_BOARD_AVERMEDIA_GO_007_FM: /* case SAA7134_BOARD_SABRENT_SBTTVFM: */ /* not finished yet */ case SAA7134_BOARD_VIDEOMATE_TV_PVR: + case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII: case SAA7134_BOARD_MANLI_MTV001: case SAA7134_BOARD_MANLI_MTV002: case SAA7134_BOARD_AVACSSMARTTV: diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index 45b10f488..1877852c3 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-input.c,v 1.20 2005/06/21 03:10:31 mkrufky Exp $ + * $Id: saa7134-input.c,v 1.21 2005/06/22 23:37:34 nsh Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -525,6 +525,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) polling = 50; // ms break; case SAA7134_BOARD_VIDEOMATE_TV_PVR: + case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII: ir_codes = videomate_tv_pvr_codes; mask_keycode = 0x00003F; mask_keyup = 0x400000; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 4b475ed91..7983d1f09 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-06-22 23:00 nshmyrev + * saa7134-cards.c, saa7134-input.c: + + - recover the original PAL tuner on Compro VideoMate Gold+ Pal + - add remote support for Compro VideoMate gold+ II, Pal saa7134 chip + + Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de> + 2005-06-22 23:20 mchehab * scripts/cardlist: - Script updated to strip tail spaces |