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 <mrjuuzer@xxxxxxxxxx>
>> Tested-by: Dorozel Csaba <mrjuuzer@xxxxxxxxxx>
>> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
>>
>> ---
>>
>> 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 <mchehab@xxxxxxxxxx>
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 <mrjuuzer@xxxxxxxxxx>
Tested-by: Dorozel Csaba <mrjuuzer@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
