diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-04 15:42:21 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-04 15:42:21 +0000 |
| commit | 51f7854a073ffc85f6a54acd04374be84bbea6da (patch) | |
| tree | edb8b0b59039b735509dee6de678cbae3b7a4916 | |
| parent | bbdc3f2170c5c7658bd4e7290c59668d2c8f603b (diff) | |
| download | mediapointer-dvb-s2-51f7854a073ffc85f6a54acd04374be84bbea6da.tar.gz mediapointer-dvb-s2-51f7854a073ffc85f6a54acd04374be84bbea6da.tar.bz2 | |
* bttv-cards.c:
* bttv.h:
- Added Osprey 440 card.
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 21 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
3 files changed, 29 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 245992843..cd26330ca 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.86 2005/10/02 22:51:48 mchehab Exp $ + $Id: bttv-cards.c,v 1.87 2005/10/04 15:42:21 nsh Exp $ bttv-cards.c @@ -168,6 +168,7 @@ static struct CARD { { 0xff020070, BTTV_BOARD_OSPREY500, "Osprey-500" }, { 0xff030070, BTTV_BOARD_OSPREY2000, "Osprey-2000" }, { 0xff040070, BTTV_BOARD_OSPREY540, "Osprey-540" }, + { 0xff070070, BTTV_BOARD_OSPREY440, "Osprey-440" }, { 0x00011002, BTTV_BOARD_ATI_TVWONDER, "ATI TV Wonder" }, { 0x00031002, BTTV_BOARD_ATI_TVWONDERVE,"ATI TV Wonder/VE" }, @@ -2778,7 +2779,23 @@ struct tvcard bttv_tvcards[] = { .radio_addr = ADDR_UNSET, .has_radio = 1, .has_remote = 1, - } + }, + /* ---- card 0x8c ---------------------------------- */ + [BTTV_BOARD_OSPREY440] = { + .name = "Osprey 440", + .video_inputs = 1, + .audio_inputs = 1, + .tuner = -1, + .svhs = 1, + .muxsel = { 2 }, + .pll = PLL_28, + .tuner_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .no_msp34xx = 1, + .no_tda9875 = 1, + .no_tda7432 = 1, + }, }; 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 95c4e65dd..7e8b98796 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.27 2005/10/02 22:51:48 mchehab Exp $ + * $Id: bttv.h,v 1.28 2005/10/04 15:42:21 nsh Exp $ * * bttv - Bt848 frame grabber driver * @@ -162,6 +162,7 @@ #define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89 #define BTTV_BOARD_PV_BT878P_2E 0x8a #define BTTV_BOARD_PV_M4900 0x8b +#define BTTV_BOARD_OSPREY440 0x8c /* i2c address list */ #define I2C_TSA5522 0xc2 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 68dff3a87..86fc60cb6 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-10-04 15:42 nshmyrev + + * bttv-cards.c: + * bttv.h: + - Added Osprey 440 card. + + Signed-off-by: Julian Calaby <julian.calaby@gmail.com> + 2005-10-04 15:00 nshmyrev * saa7134-tvaudio.c: (mute_input_7134): |