From 857e46822403f92e5db8b7dddef52a7d0cb35195 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 17 Dec 2010 14:22:09 -0300 Subject: [PATCH] --- yaml --- r: 226307 b: refs/heads/master c: e330289ed40f76819d6a13e682203c6fc9a86304 h: refs/heads/master i: 226305: 2bb06e1ff59b2a452eac5540b9e7f862958d232b 226303: ef7f6b3136573a35c6e17a0c3d6efe66c1e3068b v: v3 --- [refs] | 2 +- .../media/video/cx231xx/cx231xx-input.c | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 13c58c31ebbe..759cd549b42f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49aefd2bcda80d33497f0f26702c67e372cacef3 +refs/heads/master: e330289ed40f76819d6a13e682203c6fc9a86304 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-input.c b/trunk/drivers/media/video/cx231xx/cx231xx-input.c index c236a4e7e97b..45e14cac4622 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-input.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-input.c @@ -27,7 +27,7 @@ static int get_key_isdbt(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) { - u8 cmd; + u8 cmd, scancode; dev_dbg(&ir->rc->input_dev->dev, "%s\n", __func__); @@ -42,10 +42,21 @@ static int get_key_isdbt(struct IR_i2c *ir, u32 *ir_key, if (cmd == 0xff) return 0; - dev_dbg(&ir->rc->input_dev->dev, "scancode = %02x\n", cmd); - - *ir_key = cmd; - *ir_raw = cmd; + scancode = + ((cmd & 0x01) ? 0x80 : 0) | + ((cmd & 0x02) ? 0x40 : 0) | + ((cmd & 0x04) ? 0x20 : 0) | + ((cmd & 0x08) ? 0x10 : 0) | + ((cmd & 0x10) ? 0x08 : 0) | + ((cmd & 0x20) ? 0x04 : 0) | + ((cmd & 0x40) ? 0x02 : 0) | + ((cmd & 0x80) ? 0x01 : 0); + + dev_dbg(&ir->rc->input_dev->dev, "cmd %02x, scan = %02x\n", + cmd, scancode); + + *ir_key = scancode; + *ir_raw = scancode; return 1; }