dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

V4L/DVB: ir-nec-decoder: Cleanups

Browse source 
Remove dead code and properly name a few constants

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-04-03 20:33:00 -03:00
parent 2f16f6315f
commit 67780d6a23
1 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/media/IR/ir-nec-decoder.c
View file

@ -14,38 +14,14 @@
#include <media/ir-core.h>
#define NEC_NBITS 32
#define NEC_UNIT 559979 /* ns */
#define NEC_HEADER_MARK (16 * NEC_UNIT)
#define NEC_HEADER_SPACE (8 * NEC_UNIT)
#define NEC_REPEAT_SPACE (4 * NEC_UNIT)
#define NEC_MARK (NEC_UNIT)
#define NEC_0_SYMBOL (NEC_UNIT)
#define NEC_1_SYMBOL (3 * NEC_UNIT)
/* Start time: 4.5 ms + 560 us of the next pulse */
#define MIN_START_TIME (3900000 + 560000)
#define MAX_START_TIME (5100000 + 560000)
/* Bit 1 time: 2.25ms us */
#define MIN_BIT1_TIME 2050000
#define MAX_BIT1_TIME 2450000
/* Bit 0 time: 1.12ms us */
#define MIN_BIT0_TIME 920000
#define MAX_BIT0_TIME 1320000
/* Total IR code is 110 ms, including the 9 ms for the start pulse */
#define MAX_NEC_TIME 4000000
/* Total IR code is 110 ms, including the 9 ms for the start pulse */
#define MIN_REPEAT_TIME 99000000
#define MAX_REPEAT_TIME 112000000
/* Repeat time: 2.25ms us */
#define MIN_REPEAT_START_TIME 2050000
#define MAX_REPEAT_START_TIME 3000000
#define REPEAT_TIME 240 /* ms */
#define NEC_0_SPACE (NEC_UNIT)
#define NEC_1_SPACE (3 * NEC_UNIT)
/* Used to register nec_decoder clients */
static LIST_HEAD(decoder_list);
@ -223,11 +199,11 @@ static int handle_event(struct input_dev *input_dev,
if (last_bit)
goto err;
if ((ev->delta.tv_nsec >= NEC_0_SYMBOL - NEC_UNIT / 2) &&
(ev->delta.tv_nsec < NEC_0_SYMBOL + NEC_UNIT / 2))
if ((ev->delta.tv_nsec >= NEC_0_SPACE - NEC_UNIT / 2) &&
(ev->delta.tv_nsec < NEC_0_SPACE + NEC_UNIT / 2))
bit = 0;
else if ((ev->delta.tv_nsec >= NEC_1_SYMBOL - NEC_UNIT / 2) &&
(ev->delta.tv_nsec < NEC_1_SYMBOL + NEC_UNIT / 2))
else if ((ev->delta.tv_nsec >= NEC_1_SPACE - NEC_UNIT / 2) &&
(ev->delta.tv_nsec < NEC_1_SPACE + NEC_UNIT / 2))
bit = 1;
else {
IR_dprintk(1, "Decode failed at %d-th bit (%s) @%luus\n",
@ -256,7 +232,7 @@ static int handle_event(struct input_dev *input_dev,
data->nec_code.not_command |= 1 << (shift - 24);
}
}
if (++data->count == 32) {
if (++data->count == NEC_NBITS) {
u32 scancode;
/*
* Fixme: may need to accept Extended NEC protocol?