diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-15 12:14:22 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-15 12:14:22 +0000 |
| commit | 1406cca1ad73bfede92c2650d60b9de0ee6cf913 (patch) | |
| tree | e0c0b093e996c8e2e18fcb57048af12ba2ca268f | |
| parent | be2af23412c60398a589fce8d3f676409c935797 (diff) | |
| download | mediapointer-dvb-s2-1406cca1ad73bfede92c2650d60b9de0ee6cf913.tar.gz mediapointer-dvb-s2-1406cca1ad73bfede92c2650d60b9de0ee6cf913.tar.bz2 | |
* ../linux/Documentation/video4linux/CARDLIST.bttv:
* ../linux/drivers/media/video/bttv-cards.c:
* ../linux/drivers/media/video/bttv.h:
Added Asound Skyeye bttv card.
Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 19 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
4 files changed, 31 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index ba98ff4a7..240409999 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -139,3 +139,4 @@ 138 -> Prolink Pixelview PV-BT878P+ (Rev.2E) 139 -> Prolink PixelView PlayTV MPEG2 PV-M4900 140 -> Osprey 440 [0070:ff07] +141 -> Asound Skyeye PCTV diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 46ee26230..3c5a589bb 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.91 2005/10/11 18:02:02 mkrufky Exp $ + $Id: bttv-cards.c,v 1.92 2005/10/15 12:14:22 nsh Exp $ bttv-cards.c @@ -2803,6 +2803,23 @@ struct tvcard bttv_tvcards[] = { .no_tda9875 = 1, .no_tda7432 = 1, }, + /* ---- card 0x8d ---------------------------------- */ + [BTTV_BOARD_ASOUND_SKYEYE] = { + .name = "Asound Skyeye PCTV", + .video_inputs = 3, + .audio_inputs = 1, + .tuner = 0, + .svhs = 2, + .gpiomask = 15, + .muxsel = { 2, 3, 1, 1}, + .audiomux = {2,0,0,0,1}, + .needs_tvaudio = 1, + .pll = PLL_28, + .tuner_type = 2, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + }, + }; static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index 307442a71..616814cd3 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.30 2005/10/09 03:06:09 mkrufky Exp $ + * $Id: bttv.h,v 1.31 2005/10/15 12:14:22 nsh Exp $ * * bttv - Bt848 frame grabber driver * @@ -163,6 +163,7 @@ #define BTTV_BOARD_PV_BT878P_2E 0x8a #define BTTV_BOARD_PV_M4900 0x8b #define BTTV_BOARD_OSPREY440 0x8c +#define BTTV_BOARD_ASOUND_SKYEYE 0x8d /* i2c address list */ #define I2C_TSA5522 0xc2 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b89cea38f..5191255b6 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-10-15 12:08 nshmyrev + + * ../linux/Documentation/video4linux/CARDLIST.bttv: + * ../linux/drivers/media/video/bttv-cards.c: + * ../linux/drivers/media/video/bttv.h: + + Added Asound Skyeye bttv card. + + Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>> + 2005-10-15 09:19 nshmyrev * ../linux/drivers/usb/media/em2820-input.c: (em2820_set_ir): |