From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:53960 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988Ab2AASsG (ORCPT ); Sun, 1 Jan 2012 13:48:06 -0500 Message-ID: <4F00AA5B.30105@redhat.com> Date: Sun, 01 Jan 2012 16:47:55 -0200 From: Mauro Carvalho Chehab MIME-Version: 1.0 To: Dorozel Csaba CC: Linux Media Mailing List Subject: Re: [PATCH] [media] saa7134: fix IR handling for HVR-1110 References: <20111231132217.DZKT1551.viefep16-int.chello.at@edge01.upcmail.net> <1325365138-18745-1-git-send-email-mchehab@redhat.com> <20120101141423.HOIK1551.viefep16-int.chello.at@edge04.upcmail.net> In-Reply-To: <20120101141423.HOIK1551.viefep16-int.chello.at@edge04.upcmail.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: On 01-01-2012 12:14, Dorozel Csaba wrote: > >> Return the complete RC-5 code, instead of just the 8 least significant >> bits. >> >> Reported-by: Dorozel Csaba >> Tested-by: Dorozel Csaba >> Signed-off-by: Mauro Carvalho Chehab >> >> --- >> >> Please, re-test this patch. It is a more detailed version of the >> previous one, with a few more documentation, and some cleanups. >> >> >> drivers/media/video/saa7134/saa7134-input.c | 23 ++++++++++++++--------- >> 1 files changed, 14 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/media/video/saa7134/saa7134-input.c >> b/drivers/media/video/saa7134/saa7134-input.c index d4ee24b..0e4926a 100644 >> --- a/drivers/media/video/saa7134/saa7134-input.c >> +++ b/drivers/media/video/saa7134/saa7134-input.c >> @@ -235,22 +235,27 @@ static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) >> >> static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) >> { >> - unsigned char buf[5], cod4, code3, code4; >> + unsigned char buf[5], scancode; >> >> /* poll IR chip */ >> if (5 != i2c_master_recv(ir->c, buf, 5)) >> return -EIO; >> >> - cod4 = buf[4]; >> - code4 = (cod4 >> 2); >> - code3 = buf[3]; >> - if (code3 == 0) >> - /* no key pressed */ >> + /* Check if some key were pressed */ >> + if (!(buf[0] & 0x80)) >> return 0; >> >> - /* return key */ >> - *ir_key = code4; >> - *ir_raw = code4; >> + /* >> + * buf[3] & 0x80 is always high. >> + * buf[3] & 0x40 is a parity bit. A repeat event is marked >> + * by preserving it into two separate readings >> + * buf[4] bits 0 and 1, and buf[1] and buf[2] are always >> + * zero. >> + */ >> + scancode = 0x1fff & ((buf[3] << 8) | (buf[4] >> 2)); >> + >> + *ir_key = scancode; >> + *ir_raw = scancode; >> return 1; >> } >> > > A bit strange for me: > > This code is failed: > scancode = 0x1fff & ((buf[3] << 8) | (buf[4] >> 2)); > *ir_key = scancode; > *ir_raw = scancode; > > This code is working: > *ir_key = 0x1fff & ((buf[3] << 8) | (buf[4] >> 2)); > *ir_raw = *ir_key; Gah! scancode should be "unsigned int" and not "unsigned char". Anyway, let's simplify it by removing "scancode". There's no need for an ancillary var there. Please test the latest version. Regards, Mauro - >>From 641269f9583c5c3535dff9c66de13a8216f791a5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 31 Dec 2011 18:56:24 -0200 Subject: [PATCH] [media] saa7134: fix IR handling for HVR-1110 Return the complete RC-5 code, instead of just the 8 least significant bits. Reported-by: Dorozel Csaba Tested-by: Dorozel Csaba Signed-off-by: Mauro Carvalho Chehab diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index d4ee24b..1b15b0d 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c @@ -235,22 +235,25 @@ static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) { - unsigned char buf[5], cod4, code3, code4; + unsigned char buf[5]; /* poll IR chip */ if (5 != i2c_master_recv(ir->c, buf, 5)) return -EIO; - cod4 = buf[4]; - code4 = (cod4 >> 2); - code3 = buf[3]; - if (code3 == 0) - /* no key pressed */ + /* Check if some key were pressed */ + if (!(buf[0] & 0x80)) return 0; - /* return key */ - *ir_key = code4; - *ir_raw = code4; + /* + * buf[3] & 0x80 is always high. + * buf[3] & 0x40 is a parity bit. A repeat event is marked + * by preserving it into two separate readings + * buf[4] bits 0 and 1, and buf[1] and buf[2] are always + * zero. + */ + *ir_key = 0x1fff & ((buf[3] << 8) | (buf[4] >> 2)); + *ir_raw = *ir_key; return 1; }