X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fcommon%2Fir-common.c;h=2c007571a03e84a4342bb790a4a4c4ae42fa2f1f;hb=6f71f83334a552167ccbbd42fe5dd979428c89e4;hp=25d3945cdc0c88399ba92226b6d6cbcbaea2ac10;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c index 25d3945cd..2c007571a 100644 --- a/drivers/media/common/ir-common.c +++ b/drivers/media/common/ir-common.c @@ -1,6 +1,4 @@ /* - * $Id: ir-common.c,v 1.5 2004/11/07 13:17:15 kraxel Exp $ - * * some common structs and functions to handle infrared remotes via * input layer ... * @@ -31,11 +29,11 @@ MODULE_AUTHOR("Gerd Knorr [SuSE Labs]"); MODULE_LICENSE("GPL"); static int repeat = 1; -module_param(repeat, int, 0444); +MODULE_PARM(repeat,"i"); MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)"); static int debug = 0; /* debug level (0,1,2) */ -module_param(debug, int, 0644); +MODULE_PARM(debug,"i"); #define dprintk(level, fmt, arg...) if (debug >= level) \ printk(KERN_DEBUG fmt , ## arg) @@ -102,7 +100,7 @@ IR_KEYTAB_TYPE ir_codes_rc5_tv[IR_KEYTAB_SIZE] = { [ 0x2a ] = KEY_RESERVED, // timed page/channel clck [ 0x2b ] = KEY_RESERVED, // increment (USA) [ 0x2c ] = KEY_RESERVED, // decrement (USA) - [ 0x2d ] = KEY_RESERVED, // + [ 0x2d ] = KEY_RESERVED, // [ 0x2f ] = KEY_RESERVED, // PIP shift [ 0x31 ] = KEY_RESERVED, // erase [ 0x34 ] = KEY_RESERVED, // wind @@ -143,7 +141,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, int ir_type, IR_KEYTAB_TYPE *ir_codes) { int i; - + ir->ir_type = ir_type; if (ir_codes) memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); @@ -173,7 +171,7 @@ void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir, u32 ir_key, u32 ir_raw) { u32 keycode = IR_KEYCODE(ir->ir_codes, ir_key); - + if (ir->keypressed && ir->keycode != keycode) { ir->keypressed = 0; ir_input_key_event(dev,ir);