Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[pandora-kernel.git] / drivers / media / dvb / ttpci / av7110_ir.c

diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 357a372..617e4f6 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -15,7 +15,9 @@
 
 static int av_cnt;
 static struct av7110 *av_list[4];
-static struct input_dev input_dev;
+static struct input_dev *input_dev;
+
+static u8 delay_timer_finished;
 
 static u16 key_map [256] = {
        KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7,
@@ -43,10 +45,10 @@ static u16 key_map [256] = {
 
 static void av7110_emit_keyup(unsigned long data)
 {
-       if (!data || !test_bit(data, input_dev.key))
+       if (!data || !test_bit(data, input_dev->key))
                return;
 
-       input_event(&input_dev, EV_KEY, data, !!0);
+       input_event(input_dev, EV_KEY, data, !!0);
 }
 
 
@@ -112,13 +114,16 @@ static void av7110_emit_key(unsigned long parm)
        if (timer_pending(&keyup_timer)) {
                del_timer(&keyup_timer);
                if (keyup_timer.data != keycode || new_toggle != old_toggle) {
-                       input_event(&input_dev, EV_KEY, keyup_timer.data, !!0);
-                       input_event(&input_dev, EV_KEY, keycode, !0);
+                       delay_timer_finished = 0;
+                       input_event(input_dev, EV_KEY, keyup_timer.data, !!0);
+                       input_event(input_dev, EV_KEY, keycode, !0);
                } else
-                       input_event(&input_dev, EV_KEY, keycode, 2);
-
-       } else
-               input_event(&input_dev, EV_KEY, keycode, !0);
+                       if (delay_timer_finished)
+                               input_event(input_dev, EV_KEY, keycode, 2);
+       } else {
+               delay_timer_finished = 0;
+               input_event(input_dev, EV_KEY, keycode, !0);
+       }
 
        keyup_timer.expires = jiffies + UP_TIMEOUT;
        keyup_timer.data = keycode;
@@ -132,20 +137,34 @@ static void input_register_keys(void)
 {
        int i;
 
-       memset(input_dev.keybit, 0, sizeof(input_dev.keybit));
+       memset(input_dev->keybit, 0, sizeof(input_dev->keybit));
 
-       for (i = 0; i < sizeof(key_map) / sizeof(key_map[0]); i++) {
+       for (i = 0; i < ARRAY_SIZE(key_map); i++) {
                if (key_map[i] > KEY_MAX)
                        key_map[i] = 0;
                else if (key_map[i] > KEY_RESERVED)
-                       set_bit(key_map[i], input_dev.keybit);
+                       set_bit(key_map[i], input_dev->keybit);
        }
 }
 
 
 static void input_repeat_key(unsigned long data)
 {
-       /* dummy routine to disable autorepeat in the input driver */
+       /* called by the input driver after rep[REP_DELAY] ms */
+       delay_timer_finished = 1;
+}
+
+
+static int av7110_setup_irc_config(struct av7110 *av7110, u32 ir_config)
+{
+       int ret = 0;
+
+       dprintk(4, "%p\n", av7110);
+       if (av7110) {
+               ret = av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, SetIR, 1, ir_config);
+               av7110->ir_config = ir_config;
+       }
+       return ret;
 }
 
 
@@ -181,19 +200,6 @@ static int av7110_ir_write_proc(struct file *file, const char __user *buffer,
 }
 
 
-int av7110_setup_irc_config(struct av7110 *av7110, u32 ir_config)
-{
-       int ret = 0;
-
-       dprintk(4, "%p\n", av7110);
-       if (av7110) {
-               ret = av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, SetIR, 1, ir_config);
-               av7110->ir_config = ir_config;
-       }
-       return ret;
-}
-
-
 static void ir_handler(struct av7110 *av7110, u32 ircom)
 {
        dprintk(4, "ircommand = %08x\n", ircom);
@@ -216,12 +222,17 @@ int __init av7110_ir_init(struct av7110 *av7110)
                init_timer(&keyup_timer);
                keyup_timer.data = 0;
 
-               input_dev.name = "DVB on-card IR receiver";
-               set_bit(EV_KEY, input_dev.evbit);
-               set_bit(EV_REP, input_dev.evbit);
+               input_dev = input_allocate_device();
+               if (!input_dev)
+                       return -ENOMEM;
+
+               input_dev->name = "DVB on-card IR receiver";
+
+               set_bit(EV_KEY, input_dev->evbit);
+               set_bit(EV_REP, input_dev->evbit);
                input_register_keys();
-               input_register_device(&input_dev);
-               input_dev.timer.function = input_repeat_key;
+               input_register_device(input_dev);
+               input_dev->timer.function = input_repeat_key;
 
                e = create_proc_entry("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);
                if (e) {
@@ -256,7 +267,7 @@ void __exit av7110_ir_exit(struct av7110 *av7110)
        if (av_cnt == 1) {
                del_timer_sync(&keyup_timer);
                remove_proc_entry("av7110_ir", NULL);
-               input_unregister_device(&input_dev);
+               input_unregister_device(input_dev);
        }
 
        av_cnt--;