Skip to content

Commit

Permalink
V4L/DVB: Add RC6 support to ir-core
Browse files Browse the repository at this point in the history
This patch adds an RC6 decoder (modes 0 and 6A) to ir-core.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
David Härdeman authored and Mauro Carvalho Chehab committed May 19, 2010
1 parent 25bb10c commit 784a493
Show file tree
Hide file tree
Showing 7 changed files with 433 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/media/IR/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,12 @@ config IR_RC5_DECODER
---help---
Enable this option if you have IR with RC-5 protocol, and
if the IR is decoded in software

config IR_RC6_DECODER
tristate "Enable IR raw decoder for the RC6 protocol"
depends on IR_CORE
default y

---help---
Enable this option if you have an infrared remote control which
uses the RC6 protocol, and you need software decoding support.
1 change: 1 addition & 0 deletions drivers/media/IR/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ obj-$(CONFIG_IR_CORE) += ir-core.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o
obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o
7 changes: 7 additions & 0 deletions drivers/media/IR/ir-core-priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,11 @@ void ir_raw_init(void);
#define load_rc5_decode() 0
#endif

/* from ir-rc6-decoder.c */
#ifdef CONFIG_IR_RC5_DECODER_MODULE
#define load_rc6_decode() request_module("ir-rc6-decoder")
#else
#define load_rc6_decode() 0
#endif

#endif /* _IR_RAW_EVENT */
1 change: 1 addition & 0 deletions drivers/media/IR/ir-raw-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ static void init_decoders(struct work_struct *work)

load_nec_decode();
load_rc5_decode();
load_rc6_decode();

/* If needed, we may later add some init code. In this case,
it is needed to change the CONFIG_MODULE test at ir-core.h
Expand Down
Loading

0 comments on commit 784a493

Please sign in to comment.