diff options
| author | Michael Krufky <devnull@localhost> | 2006-01-10 04:29:23 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2006-01-10 04:29:23 +0000 |
| commit | d71c2b766251c46d3bfb05037c3b1aaea7947a7a (patch) | |
| tree | 01e9247d36dfb5b084064f0657c6da9320d0c5e6 | |
| parent | cb734097e7b05b451b19e1f897dbded3622583fd (diff) | |
| download | mediapointer-dvb-s2-d71c2b766251c46d3bfb05037c3b1aaea7947a7a.tar.gz mediapointer-dvb-s2-d71c2b766251c46d3bfb05037c3b1aaea7947a7a.tar.bz2 | |
Add bttv card MagicTV (rebranded MachTV)
From: Julian Calaby <julian.calaby@gmail.com>
- Add bttv card MagicTV (rebranded MachTV)
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 25 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-input.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
5 files changed, 45 insertions, 3 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index 74fb085e1..b72706c58 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -142,3 +142,4 @@ 141 -> Asound Skyeye PCTV 142 -> Sabrent TV-FM (bttv version) 143 -> Hauppauge ImpactVCB (bt878) [0070:13eb] +144 -> MagicTV diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 3114ddae9..80d7613bd 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.106 2006/01/01 17:17:38 mchehab Exp $ + $Id: bttv-cards.c,v 1.107 2006/01/10 04:29:23 mkrufky Exp $ bttv-cards.c @@ -2860,6 +2860,29 @@ struct tvcard bttv_tvcards[] = { .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, }, + [BTTV_BOARD_MACHTV_MAGICTV] = { + /* Julian Calaby <julian.calaby@gmail.com> + * Slightly different from original MachTV definition (0x60) + + * FIXME: RegSpy says gpiomask should be "0x001c800f", but it + * stuffs up remote chip. Bug is a pin on the jaecs is not set + * properly (methinks) causing no keyup bits being set */ + + .name = "MagicTV", /* rebranded MachTV */ + .video_inputs = 3, + .audio_inputs = 1, + .tuner = 0, + .svhs = 2, + .gpiomask = 7, + .muxsel = { 2, 3, 1, 1 }, + .audiomux = { 0, 1, 2, 3, 4 }, + .tuner_type = TUNER_TEMIC_4009FR5_PAL, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .pll = PLL_28, + .has_radio = 1, + .has_remote = 1, + }, }; static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bttv-input.c index 21f8ebc44..8351581a3 100644 --- a/linux/drivers/media/video/bttv-input.c +++ b/linux/drivers/media/video/bttv-input.c @@ -1,5 +1,5 @@ /* - * $Id: bttv-input.c,v 1.3 2005/12/18 18:52:14 rmcc Exp $ + * $Id: bttv-input.c,v 1.4 2006/01/10 04:29:23 mkrufky Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -585,6 +585,12 @@ int bttv_input_init(struct bttv *btv) btv->custom_irq = bttv_rc5_irq; ir->rc5_gpio = 1; break; + case BTTV_BOARD_MACHTV_MAGICTV: + ir_codes = ir_codes_apac_viewcomp; + ir->mask_keycode = 0x001F00; + ir->mask_keyup = 0x004000; + ir->polling = 50; /* ms */ + break; } if (NULL == ir_codes) { dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n",btv->c.type); diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index dec77cd0a..39d79e10e 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.36 2005/12/10 17:51:31 rmcc Exp $ + * $Id: bttv.h,v 1.37 2006/01/10 04:29:23 mkrufky Exp $ * * bttv - Bt848 frame grabber driver * @@ -168,6 +168,7 @@ #define BTTV_BOARD_ASOUND_SKYEYE 0x8d #define BTTV_BOARD_SABRENT_TVFM 0x8e #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f +#define BTTV_BOARD_MACHTV_MAGICTV 0x90 /* i2c address list */ #define I2C_TSA5522 0xc2 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ba835abc3..84168d419 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2006-01-10 04:27 mkrufky + + * linux/Documentation/video4linux/CARDLIST.bttv: + * linux/drivers/media/video/bttv-cards.c: + * linux/drivers/media/video/bttv-input.c: (bttv_input_init): + * linux/drivers/media/video/bttv.h: + - Add card MagicTV (rebranded MachTV) + + Signed-off-by: Julian Calaby <julian.calaby@gmail.com> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-09 23:58 pascoe * linux/drivers/media/video/cx88/cx88-input.c: (cx88_ir_irq): |