diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-13 16:07:46 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-13 16:07:46 +0000 |
| commit | 9dfe41790086d342d776ceb3cc240d8c020976e9 (patch) | |
| tree | 1d0172ae40d2c8dc479b8b9c322a55e0dfb2d583 | |
| parent | 3a6970ad156f0a714771661b4557341365e9ce4d (diff) | |
| download | mediapointer-dvb-s2-9dfe41790086d342d776ceb3cc240d8c020976e9.tar.gz mediapointer-dvb-s2-9dfe41790086d342d776ceb3cc240d8c020976e9.tar.bz2 | |
* bttvp.h:
- Fix gcc 4.0 compilation
* cx88-input.c:
- Add remove for MSI TV@nywhere. Thanks to
Jorik Jonker <jorik@dnd.utwente.nl>
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 12 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 38 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 53 insertions, 7 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index 0133eb616..4d9a896ce 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.17 2005/02/16 12:14:10 kraxel Exp $ + $Id: bttvp.h,v 1.18 2005/06/13 16:07:46 nsh Exp $ bttv - Bt848 frame grabber driver @@ -238,11 +238,6 @@ extern int fini_bttv_i2c(struct bttv *btv); #define dprintk if (bttv_debug >= 1) printk #define d2printk if (bttv_debug >= 2) printk -/* our devices */ -#define BTTV_MAX 16 -extern unsigned int bttv_num; -extern struct bttv bttvs[BTTV_MAX]; - #define BTTV_MAX_FBUF 0x208000 #define VBIBUF_SIZE (2048*VBI_MAXLINES*2) #define BTTV_TIMEOUT (HZ/2) /* 0.5 seconds */ @@ -392,6 +387,11 @@ struct bttv { struct bttv_fh init; }; +/* our devices */ +#define BTTV_MAX 16 +extern unsigned int bttv_num; +extern struct bttv bttvs[BTTV_MAX]; + /* private ioctls */ #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int) #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int) diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 5e6d1bfcc..76d506db6 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.12 2005/06/12 23:32:13 nsh Exp $ + * $Id: cx88-input.c,v 1.13 2005/06/13 16:07:46 nsh Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -175,6 +175,35 @@ static IR_KEYTAB_TYPE ir_codes_adstech_dvb_t_pci[IR_KEYTAB_SIZE] = { /* ---------------------------------------------------------------------- */ +/* MSI TV@nywhere remote */ +static IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = { + [ 0x00 ] = KEY_0, /* '0' */ + [ 0x01 ] = KEY_1, /* '1' */ + [ 0x02 ] = KEY_2, /* '2' */ + [ 0x03 ] = KEY_3, /* '3' */ + [ 0x04 ] = KEY_4, /* '4' */ + [ 0x05 ] = KEY_5, /* '5' */ + [ 0x06 ] = KEY_6, /* '6' */ + [ 0x07 ] = KEY_7, /* '7' */ + [ 0x08 ] = KEY_8, /* '8' */ + [ 0x09 ] = KEY_9, /* '9' */ + [ 0x0c ] = KEY_MUTE, /* 'Mute' */ + [ 0x0f ] = KEY_SCREEN, /* 'Full Screen' */ + [ 0x10 ] = KEY_F, /* 'Funtion' */ + [ 0x11 ] = KEY_T, /* 'Time shift' */ + [ 0x12 ] = KEY_POWER, /* 'Power' */ + [ 0x13 ] = KEY_MEDIA, /* 'MTS' */ + [ 0x14 ] = KEY_SLOW, /* 'Slow' */ + [ 0x16 ] = KEY_REWIND, /* 'backward <<' */ + [ 0x17 ] = KEY_ENTER, /* 'Return' */ + [ 0x18 ] = KEY_FASTFORWARD, /* 'forward >>' */ + [ 0x1a ] = KEY_CHANNELUP, /* 'Channel+' */ + [ 0x1b ] = KEY_VOLUMEUP, /* 'Volume+' */ + [ 0x1e ] = KEY_CHANNELDOWN, /* 'Channel-' */ + [ 0x1f ] = KEY_VOLUMEDOWN, /* 'Volume-' */ +}; + +/* ---------------------------------------------------------------------- */ struct cx88_IR { struct cx88_core *core; @@ -327,6 +356,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->mask_keyup = 0x40; ir->polling = 50; // ms break; + case CX88_BOARD_MSI_TVANYWHERE_MASTER: + ir_codes = ir_codes_msi_tvanywhere; + ir->gpio_addr = MO_GP1_IO; + ir->mask_keycode = 0x1f; + ir->mask_keyup = 0x40; + ir->polling = 1; + break; } if (NULL == ir_codes) { diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ed30da499..6db1f2234 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-06-13 19:57 nshmyrev + * bttvp.h: + + - Fix gcc 4.0 compilation + + * cx88-input.c: + + - Add remove for MSI TV@nywhere. Thanks to + Jorik Jonker <jorik@dnd.utwente.nl> + 2005-06-13 13:00 nshmyrev * saa7134-cards.c, caa7134.h, doc/README.saa7134: |