From: David Härdeman Date: Thu, 8 Apr 2010 23:04:35 +0000 (-0300) Subject: V4L/DVB: Add NECx support to ir-core X-Git-Tag: v2.6.35-rc1~480^2~200 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=25bb10c11e6cca461f09df8f59c2eb501a9e4d52;p=net-next-2.6.git V4L/DVB: Add NECx support to ir-core This patch adds NECx support to drivers/media/IR/ir-nec-decoder.c Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c index 4c223f611a5..14609d9580a 100644 --- a/drivers/media/IR/ir-nec-decoder.c +++ b/drivers/media/IR/ir-nec-decoder.c @@ -18,6 +18,7 @@ #define NEC_NBITS 32 #define NEC_UNIT 562500 /* ns */ #define NEC_HEADER_PULSE PULSE(16) +#define NECX_HEADER_PULSE PULSE(8) /* Less common NEC variant */ #define NEC_HEADER_SPACE SPACE(8) #define NEC_REPEAT_SPACE SPACE(4) #define NEC_BIT_PULSE PULSE(1) @@ -152,7 +153,7 @@ static int ir_nec_decode(struct input_dev *input_dev, s64 duration) switch (data->state) { case STATE_INACTIVE: - if (u == NEC_HEADER_PULSE) { + if (u == NEC_HEADER_PULSE || u == NECX_HEADER_PULSE) { data->count = 0; data->state = STATE_HEADER_SPACE; }