diff options
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 13 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
2 files changed, 21 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index 8486a0f99..92d3c192d 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-i2c.c,v 1.33 2006/01/17 16:18:41 rmcc Exp $ + * $Id: ir-kbd-i2c.c,v 1.34 2006/01/17 16:43:41 rmcc Exp $ * * keyboard input driver for i2c IR remote controls * @@ -53,6 +53,11 @@ static int debug; module_param(debug, int, 0644); /* debug level (0,1,2) */ +static int hauppauge = 0; +module_param(hauppauge, int, 0644); /* Choose Hauppauge remote */ +MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)"); + + #define DEVNAME "ir-kbd-i2c" #define dprintk(level, fmt, arg...) if (debug >= level) \ printk(KERN_DEBUG DEVNAME ": " fmt , ## arg) @@ -308,7 +313,11 @@ static int ir_attach(struct i2c_adapter *adap, int addr, name = "Hauppauge"; ir->get_key = get_key_haup; ir_type = IR_TYPE_RC5; - ir_codes = ir_codes_rc5_tv; + if (hauppauge == 1) { + ir_codes = ir_codes_rc5_tv_grey; + } else { + ir_codes = ir_codes_rc5_tv; + } break; case 0x30: name = "KNC One"; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index baacb8c28..525eea6a1 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2006-01-17 16:40 rmcc + + * linux/drivers/media/video/ir-kbd-i2c.c: (ir_attach): + + - Added support for the newer (Grey) Hauppauge remote to + ir-kbd-i2c + + Signed-off-by: J.O. Aho <trizt@iname.com> + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2006-01-17 16:26 rmcc * linux/include/media/ir-keymaps.h: |