diff options
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 13 |
4 files changed, 33 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index d476f8e15..d2688c71c 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -77,3 +77,4 @@ 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] 78 -> ASUSTeK P7131 Dual [1043:4862] + 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B) diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 28fc8055a..060515642 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.105 2005/10/20 00:02:54 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.106 2005/10/20 19:00:57 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2451,6 +2451,21 @@ struct saa7134_board saa7134_boards[] = { .gpio = 0x0200000, }, }, + [SAA7134_BOARD_PCTV_CARDBUS] = { + /* Paul Tom Zalac <pzalac@gmail.com> */ + /* tda8275a tuner doesnt work yet */ + .name = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_ABSENT, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .inputs = {{ + .name = name_comp1, + .vmux = 1, + .amux = LINE2, + }}, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -3015,6 +3030,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) case SAA7134_BOARD_AVACSSMARTTV: case SAA7134_BOARD_GOTVIEW_7135: case SAA7134_BOARD_KWORLD_TERMINATOR: + case SAA7134_BOARD_PCTV_CARDBUS: dev->has_remote = 1; break; case SAA7134_BOARD_MD5044: diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index b7eecdf72..2a8c3964d 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.71 2005/10/20 00:02:54 mkrufky Exp $ + * $Id: saa7134.h,v 1.72 2005/10/20 19:00:57 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -213,6 +213,7 @@ struct saa7134_format { #define SAA7134_BOARD_MONSTERTV_MOBILE 76 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 +#define SAA7134_BOARD_PCTV_CARDBUS 79 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 94b344071..f27995188 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2005-10-20 18:55 mkrufky + + * ../linux/Documentation/video4linux/CARDLIST.saa7134: + * ../linux/drivers/media/video/saa7134/saa7134-cards.c: + (saa7134_board_init1): + * ../linux/drivers/media/video/saa7134/saa7134.h: + - add card: PCTV Cardbus TV/Radio (ITO25 Rev:2B) + Composite input only for now. + Uses tda8275a tuner, not yet working. + + Signed-off-by: Paul T Zalac <pzalac@gmail.com> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-20 00:00 mkrufky * ../linux/Documentation/video4linux/CARDLIST.saa7134: |