aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-01-21 15:14:13 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-21 15:47:07 (GMT)
commit9165144033944a4c650a9914888bf6b6f7328c7a (patch)
tree400d6d4ea001cc7b93ee127fa58727cd69b01e89
parent711e1398d3131fd83aee0a35d450c6e1a809bfb2 (diff)
[media] az6007: Fix IR handling
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/az6007.c31
1 files changed, 13 insertions, 18 deletions
diff --git a/drivers/media/dvb/dvb-usb/az6007.c b/drivers/media/dvb/dvb-usb/az6007.c
index 142ef7b..a8aedb8 100644
--- a/drivers/media/dvb/dvb-usb/az6007.c
+++ b/drivers/media/dvb/dvb-usb/az6007.c
@@ -204,13 +204,7 @@ static int az6007_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
struct az6007_device_state *st = d->priv;
struct rc_map_table *keymap = d->props.rc.legacy.rc_map_table;
int i;
-
- /*
- * FIXME: remove the following return to enabled remote querying
- * The driver likely needs proper locking to avoid troubles between
- * this call and other concurrent calls.
- */
- return 0;
+ unsigned code = 0;
az6007_read(d, AZ6007_READ_IR, 0, 0, st->data, 10);
@@ -219,20 +213,21 @@ static int az6007_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
return 0;
}
- /*
- * FIXME: need to make something useful with the keycodes and to
- * convert it to the non-legacy mode. Yet, it is producing some
- * debug info already, like:
- * 88 04 eb 02 fd ff 00 82 63 82 (terratec IR)
- * 88 04 eb 03 fc 00 00 82 63 82 (terratec IR)
- * 88 80 7e 0d f2 ff 00 82 63 82 (another NEC-extended based IR)
- * I suspect that the IR data is at bytes 1 to 4, and byte 5 is parity
- */
- deb_rc("remote query key: %x %d\n", st->data[1], st->data[1]);
+ if ((st->data[1] ^ st->data[2]) == 0xff)
+ code = st->data[1];
+ else
+ code = st->data[1] << 8 | st->data[2];
+
+ if ((st->data[3] ^ st->data[4]) == 0xff)
+ code = code << 8 | st->data[3];
+ else
+ code = code << 16 | st->data[3] << 8| st->data[4];
+
+ printk("remote query key: %04x\n", code);
print_hex_dump_bytes("Remote: ", DUMP_PREFIX_NONE, st->data, 10);
for (i = 0; i < d->props.rc.legacy.rc_map_size; i++) {
- if (rc5_custom(&keymap[i]) == st->data[1]) {
+ if (rc5_custom(&keymap[i]) == code) {
*event = keymap[i].keycode;
*state = REMOTE_KEY_PRESSED;

Privacy Policy