V4L/DVB (4561): Sync'ing dvb-usb-remote with changes in USB input subsystem

[powerpc.git] / drivers / media / dvb / dvb-usb / dvb-usb-remote.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 9f1e23f..380b2a4 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -6,6 +6,7 @@
  * This file contains functions for initializing the the input-device and for handling remote-control-queries.
  */
 #include "dvb-usb-common.h"
+#include <linux/usb/input.h>
 
 /* Remote-control poll function - called every dib->rc_query_interval ms to see
  * whether the remote control has received anything.
@@ -21,6 +22,10 @@ static void dvb_usb_read_remote_control(void *data)
        /* TODO: need a lock here.  We can simply skip checking for the remote control
           if we're busy. */
 
+       /* when the parameter has been set to 1 via sysfs while the driver was running */
+       if (dvb_usb_disable_rc_polling)
+               return;
+
        if (d->props.rc_query(d,&event,&state)) {
                err("error while querying for an remote control event.");
                goto schedule;
@@ -35,9 +40,9 @@ static void dvb_usb_read_remote_control(void *data)
                        d->last_event = event;
                case REMOTE_KEY_REPEAT:
                        deb_rc("key repeated\n");
-                       input_event(&d->rc_input_dev, EV_KEY, event, 1);
-                       input_event(&d->rc_input_dev, EV_KEY, d->last_event, 0);
-                       input_sync(&d->rc_input_dev);
+                       input_event(d->rc_input_dev, EV_KEY, event, 1);
+                       input_event(d->rc_input_dev, EV_KEY, d->last_event, 0);
+                       input_sync(d->rc_input_dev);
                        break;
                default:
                        break;
@@ -49,8 +54,8 @@ static void dvb_usb_read_remote_control(void *data)
                        deb_rc("NO KEY PRESSED\n");
                        if (d->last_state != REMOTE_NO_KEY_PRESSED) {
                                deb_rc("releasing event %d\n",d->last_event);
-                               input_event(&d->rc_input_dev, EV_KEY, d->last_event, 0);
-                               input_sync(&d->rc_input_dev);
+                               input_event(d->rc_input_dev, EV_KEY, d->last_event, 0);
+                               input_sync(d->rc_input_dev);
                        }
                        d->last_state = REMOTE_NO_KEY_PRESSED;
                        d->last_event = 0;
@@ -59,8 +64,8 @@ static void dvb_usb_read_remote_control(void *data)
                        deb_rc("KEY PRESSED\n");
                        deb_rc("pressing event %d\n",event);
 
-                       input_event(&d->rc_input_dev, EV_KEY, event, 1);
-                       input_sync(&d->rc_input_dev);
+                       input_event(d->rc_input_dev, EV_KEY, event, 1);
+                       input_sync(d->rc_input_dev);
 
                        d->last_event = event;
                        d->last_state = REMOTE_KEY_PRESSED;
@@ -69,8 +74,8 @@ static void dvb_usb_read_remote_control(void *data)
                        deb_rc("KEY_REPEAT\n");
                        if (d->last_state != REMOTE_NO_KEY_PRESSED) {
                                deb_rc("repeating event %d\n",d->last_event);
-                               input_event(&d->rc_input_dev, EV_KEY, d->last_event, 2);
-                               input_sync(&d->rc_input_dev);
+                               input_event(d->rc_input_dev, EV_KEY, d->last_event, 2);
+                               input_sync(d->rc_input_dev);
                                d->last_state = REMOTE_KEY_REPEAT;
                        }
                default:
@@ -85,22 +90,32 @@ schedule:
 int dvb_usb_remote_init(struct dvb_usb_device *d)
 {
        int i;
-       if (d->props.rc_key_map == NULL)
+
+       if (d->props.rc_key_map == NULL ||
+               d->props.rc_query == NULL ||
+               dvb_usb_disable_rc_polling)
                return 0;
 
-       /* Initialise the remote-control structures.*/
-       init_input_dev(&d->rc_input_dev);
+       usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
+       strlcat(d->rc_phys, "/ir0", sizeof(d->rc_phys));
+
+       d->rc_input_dev = input_allocate_device();
+       if (!d->rc_input_dev)
+               return -ENOMEM;
 
-       d->rc_input_dev.evbit[0] = BIT(EV_KEY);
-       d->rc_input_dev.keycodesize = sizeof(unsigned char);
-       d->rc_input_dev.keycodemax = KEY_MAX;
-       d->rc_input_dev.name = "IR-receiver inside an USB DVB receiver";
+       d->rc_input_dev->evbit[0] = BIT(EV_KEY);
+       d->rc_input_dev->keycodesize = sizeof(unsigned char);
+       d->rc_input_dev->keycodemax = KEY_MAX;
+       d->rc_input_dev->name = "IR-receiver inside an USB DVB receiver";
+       d->rc_input_dev->phys = d->rc_phys;
+       usb_to_input_id(d->udev, &d->rc_input_dev->id);
+       d->rc_input_dev->cdev.dev = &d->udev->dev;
 
        /* set the bits for the keys */
-       deb_rc("key map size: %d\n",d->props.rc_key_map_size);
+       deb_rc("key map size: %d\n", d->props.rc_key_map_size);
        for (i = 0; i < d->props.rc_key_map_size; i++) {
                deb_rc("setting bit for event %d item %d\n",d->props.rc_key_map[i].event, i);
-               set_bit(d->props.rc_key_map[i].event, d->rc_input_dev.keybit);
+               set_bit(d->props.rc_key_map[i].event, d->rc_input_dev->keybit);
        }
 
        /* Start the remote-control polling. */
@@ -108,14 +123,14 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
                d->props.rc_interval = 100; /* default */
 
        /* setting these two values to non-zero, we have to manage key repeats */
-       d->rc_input_dev.rep[REP_PERIOD] = d->props.rc_interval;
-       d->rc_input_dev.rep[REP_DELAY]  = d->props.rc_interval + 150;
+       d->rc_input_dev->rep[REP_PERIOD] = d->props.rc_interval;
+       d->rc_input_dev->rep[REP_DELAY]  = d->props.rc_interval + 150;
 
-       input_register_device(&d->rc_input_dev);
+       input_register_device(d->rc_input_dev);
 
        INIT_WORK(&d->rc_query_work, dvb_usb_read_remote_control, d);
 
-       info("schedule remote query interval to %d msecs.",d->props.rc_interval);
+       info("schedule remote query interval to %d msecs.", d->props.rc_interval);
        schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
 
        d->state |= DVB_USB_STATE_REMOTE;
@@ -128,7 +143,7 @@ int dvb_usb_remote_exit(struct dvb_usb_device *d)
        if (d->state & DVB_USB_STATE_REMOTE) {
                cancel_delayed_work(&d->rc_query_work);
                flush_scheduled_work();
-               input_unregister_device(&d->rc_input_dev);
+               input_unregister_device(d->rc_input_dev);
        }
        d->state &= ~DVB_USB_STATE_REMOTE;
        return 0;
@@ -154,12 +169,12 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d,
                                break;
                        }
                        /* See if we can match the raw key code. */
-                       for (i = 0; i < sizeof(keymap)/sizeof(struct dvb_usb_rc_key); i++)
+                       for (i = 0; i < d->props.rc_key_map_size; i++)
                                if (keymap[i].custom == keybuf[1] &&
                                        keymap[i].data == keybuf[3]) {
                                        *event = keymap[i].event;
                                        *state = REMOTE_KEY_PRESSED;
-                                       break;
+                                       return 0;
                                }
                        deb_err("key mapping failed - no appropriate key found in keymapping\n");
                        break;