]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] m920x: introduce m920x_rc_core_query()
authorAntonio Ospite <ospite@studenti.unina.it>
Mon, 10 Dec 2012 20:37:14 +0000 (17:37 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 27 Dec 2012 18:30:48 +0000 (16:30 -0200)
Add an m920x_rc_core_query() function for drivers which want to use the
linux RC core infrastructure.

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/dvb-usb/m920x.c

index 5f6ca753e293149252f2535d40ef519d09f60c57..bddd7637fdaa6d01a68783b0daf7d4815ff79cc8 100644 (file)
@@ -215,6 +215,38 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        return ret;
 }
 
+static int m920x_rc_core_query(struct dvb_usb_device *d)
+{
+       int ret = 0;
+       u8 *rc_state;
+       int state;
+
+       rc_state = kmalloc(2, GFP_KERNEL);
+       if (!rc_state)
+               return -ENOMEM;
+
+       if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, &rc_state[0], 1)) != 0)
+               goto out;
+
+       if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, &rc_state[1], 1)) != 0)
+               goto out;
+
+       deb("state=0x%02x keycode=0x%02x\n", rc_state[0], rc_state[1]);
+
+       m920x_parse_rc_state(d, rc_state[0], &state);
+
+       if (state == REMOTE_NO_KEY_PRESSED)
+               rc_keyup(d->rc_dev);
+       else if (state == REMOTE_KEY_REPEAT)
+               rc_repeat(d->rc_dev);
+       else
+               rc_keydown(d->rc_dev, rc_state[1], 0);
+
+out:
+       kfree(rc_state);
+       return ret;
+}
+
 /* I2C */
 static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
 {