Skip to content

L
linux
Commit 2886f013 authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files
Options

[media] bt8xx: fixup RC5 decoding 

The bt8xx driver does RC5 decoding for Nebula digi hardware, but includes
some pointless limitations (both start bits must be one, the
device/address/system must be 0x00). Remove those limitations and update
the keymap to use the full RC5 scancode (fortunately the 0x00 address
means that this is perfectly backwards compatible).
Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent e9035152
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 88 deletions
drivers/media/pci/bt8xx/bttv-input.c
View file @ 2886f013
...@@ -154,10 +154,10 @@ static void bttv_input_timer(unsigned long data) ...@@ -154,10 +154,10 @@ static void bttv_input_timer(unsigned long data)
* testing. * testing.
*/ */
#define RC5_START(x) (((x) >> 12) & 3) #define RC5_START(x) (((x) >> 12) & 0x03)
#define RC5_TOGGLE(x) (((x) >> 11) & 1) #define RC5_TOGGLE(x) (((x) >> 11) & 0x01)
#define RC5_ADDR(x) (((x) >> 6) & 31) #define RC5_ADDR(x) (((x) >> 6) & 0x1f)
#define RC5_INSTR(x) ((x) & 63) #define RC5_INSTR(x) (((x) >> 0) & 0x3f)
/* decode raw bit pattern to RC5 code */ /* decode raw bit pattern to RC5 code */
static u32 bttv_rc5_decode(unsigned int code) static u32 bttv_rc5_decode(unsigned int code)
...@@ -195,8 +195,8 @@ static void bttv_rc5_timer_end(unsigned long data) ...@@ -195,8 +195,8 @@ static void bttv_rc5_timer_end(unsigned long data)
{ {
struct bttv_ir *ir = (struct bttv_ir *)data; struct bttv_ir *ir = (struct bttv_ir *)data;
struct timeval tv; struct timeval tv;
u32 gap; u32 gap, rc5, scancode;
u32 rc5 = 0; u8 toggle, command, system;
/* get time */ /* get time */
do_gettimeofday(&tv); do_gettimeofday(&tv);
...@@ -221,26 +221,29 @@ static void bttv_rc5_timer_end(unsigned long data) ...@@ -221,26 +221,29 @@ static void bttv_rc5_timer_end(unsigned long data)
if (ir->last_bit < 20) { if (ir->last_bit < 20) {
/* ignore spurious codes (caused by light/other remotes) */ /* ignore spurious codes (caused by light/other remotes) */
dprintk("short code: %x\n", ir->code); dprintk("short code: %x\n", ir->code);
} else { return;
}
ir->code = (ir->code << ir->shift_by) | 1; ir->code = (ir->code << ir->shift_by) | 1;
rc5 = bttv_rc5_decode(ir->code); rc5 = bttv_rc5_decode(ir->code);
/* two start bits? */ toggle = RC5_TOGGLE(rc5);
if (RC5_START(rc5) != ir->start) { system = RC5_ADDR(rc5);
pr_info(DEVNAME ":" command = RC5_INSTR(rc5);
" rc5 start bits invalid: %u\n", RC5_START(rc5));
/* right address? */
} else if (RC5_ADDR(rc5) == ir->addr) {
u32 toggle = RC5_TOGGLE(rc5);
u32 instr = RC5_INSTR(rc5);
/* Good code */ switch (RC5_START(rc5)) {
rc_keydown(ir->dev, instr, toggle); case 0x3:
dprintk("instruction %x, toggle %x\n", break;
instr, toggle); case 0x2:
} command += 0x40;
break;
default:
return;
} }
scancode = system << 8 | command;
rc_keydown(ir->dev, scancode, toggle);
dprintk("scancode %x, toggle %x\n", scancode, toggle);
} }
static int bttv_rc5_irq(struct bttv *btv) static int bttv_rc5_irq(struct bttv *btv)
...@@ -310,8 +313,6 @@ static void bttv_ir_start(struct bttv *btv, struct bttv_ir *ir) ...@@ -310,8 +313,6 @@ static void bttv_ir_start(struct bttv *btv, struct bttv_ir *ir)
/* set timer_end for code completion */ /* set timer_end for code completion */
setup_timer(&ir->timer, bttv_rc5_timer_end, (unsigned long)ir); setup_timer(&ir->timer, bttv_rc5_timer_end, (unsigned long)ir);
ir->shift_by = 1; ir->shift_by = 1;
ir->start = 3;
ir->addr = 0x0;
ir->rc5_remote_gap = ir_rc5_remote_gap; ir->rc5_remote_gap = ir_rc5_remote_gap;
} }
} }
...@@ -514,7 +515,8 @@ int bttv_input_init(struct bttv *btv) ...@@ -514,7 +515,8 @@ int bttv_input_init(struct bttv *btv)
ir->mask_keycode); ir->mask_keycode);
break; break;
} }
if (NULL == ir_codes) {
if (!ir_codes) {
dprintk("Ooops: IR config error [card=%d]\n", btv->c.type); dprintk("Ooops: IR config error [card=%d]\n", btv->c.type);
err = -ENODEV; err = -ENODEV;
goto err_out_free; goto err_out_free;
......
drivers/media/pci/bt8xx/bttvp.h
View file @ 2886f013
...@@ -133,8 +133,6 @@ struct bttv_ir { ...@@ -133,8 +133,6 @@ struct bttv_ir {
u32 polling; u32 polling;
u32 last_gpio; u32 last_gpio;
int shift_by; int shift_by;
int start; // What should RC5_START() be
int addr; // What RC5_ADDR() should be.
int rc5_remote_gap; int rc5_remote_gap;
/* RC5 gpio */ /* RC5 gpio */
......
drivers/media/rc/keymaps/rc-nebula.c
View file @ 2886f013
...@@ -14,68 +14,68 @@ ...@@ -14,68 +14,68 @@
#include <linux/module.h> #include <linux/module.h>
static struct rc_map_table nebula[] = { static struct rc_map_table nebula[] = {
{ 0x00, KEY_0 }, { 0x0000, KEY_0 },
{ 0x01, KEY_1 }, { 0x0001, KEY_1 },
{ 0x02, KEY_2 }, { 0x0002, KEY_2 },
{ 0x03, KEY_3 }, { 0x0003, KEY_3 },
{ 0x04, KEY_4 }, { 0x0004, KEY_4 },
{ 0x05, KEY_5 }, { 0x0005, KEY_5 },
{ 0x06, KEY_6 }, { 0x0006, KEY_6 },
{ 0x07, KEY_7 }, { 0x0007, KEY_7 },
{ 0x08, KEY_8 }, { 0x0008, KEY_8 },
{ 0x09, KEY_9 }, { 0x0009, KEY_9 },
{ 0x0a, KEY_TV }, { 0x000a, KEY_TV },
{ 0x0b, KEY_AUX }, { 0x000b, KEY_AUX },
{ 0x0c, KEY_DVD }, { 0x000c, KEY_DVD },
{ 0x0d, KEY_POWER }, { 0x000d, KEY_POWER },
{ 0x0e, KEY_CAMERA }, /* labelled 'Picture' */ { 0x000e, KEY_CAMERA }, /* labelled 'Picture' */
{ 0x0f, KEY_AUDIO }, { 0x000f, KEY_AUDIO },
{ 0x10, KEY_INFO }, { 0x0010, KEY_INFO },
{ 0x11, KEY_F13 }, /* 16:9 */ { 0x0011, KEY_F13 }, /* 16:9 */
{ 0x12, KEY_F14 }, /* 14:9 */ { 0x0012, KEY_F14 }, /* 14:9 */
{ 0x13, KEY_EPG }, { 0x0013, KEY_EPG },
{ 0x14, KEY_EXIT }, { 0x0014, KEY_EXIT },
{ 0x15, KEY_MENU }, { 0x0015, KEY_MENU },
{ 0x16, KEY_UP }, { 0x0016, KEY_UP },
{ 0x17, KEY_DOWN }, { 0x0017, KEY_DOWN },
{ 0x18, KEY_LEFT }, { 0x0018, KEY_LEFT },
{ 0x19, KEY_RIGHT }, { 0x0019, KEY_RIGHT },
{ 0x1a, KEY_ENTER }, { 0x001a, KEY_ENTER },
{ 0x1b, KEY_CHANNELUP }, { 0x001b, KEY_CHANNELUP },
{ 0x1c, KEY_CHANNELDOWN }, { 0x001c, KEY_CHANNELDOWN },
{ 0x1d, KEY_VOLUMEUP }, { 0x001d, KEY_VOLUMEUP },
{ 0x1e, KEY_VOLUMEDOWN }, { 0x001e, KEY_VOLUMEDOWN },
{ 0x1f, KEY_RED }, { 0x001f, KEY_RED },
{ 0x20, KEY_GREEN }, { 0x0020, KEY_GREEN },
{ 0x21, KEY_YELLOW }, { 0x0021, KEY_YELLOW },
{ 0x22, KEY_BLUE }, { 0x0022, KEY_BLUE },
{ 0x23, KEY_SUBTITLE }, { 0x0023, KEY_SUBTITLE },
{ 0x24, KEY_F15 }, /* AD */ { 0x0024, KEY_F15 }, /* AD */
{ 0x25, KEY_TEXT }, { 0x0025, KEY_TEXT },
{ 0x26, KEY_MUTE }, { 0x0026, KEY_MUTE },
{ 0x27, KEY_REWIND }, { 0x0027, KEY_REWIND },
{ 0x28, KEY_STOP }, { 0x0028, KEY_STOP },
{ 0x29, KEY_PLAY }, { 0x0029, KEY_PLAY },
{ 0x2a, KEY_FASTFORWARD }, { 0x002a, KEY_FASTFORWARD },
{ 0x2b, KEY_F16 }, /* chapter */ { 0x002b, KEY_F16 }, /* chapter */
{ 0x2c, KEY_PAUSE }, { 0x002c, KEY_PAUSE },
{ 0x2d, KEY_PLAY }, { 0x002d, KEY_PLAY },
{ 0x2e, KEY_RECORD }, { 0x002e, KEY_RECORD },
{ 0x2f, KEY_F17 }, /* picture in picture */ { 0x002f, KEY_F17 }, /* picture in picture */
{ 0x30, KEY_KPPLUS }, /* zoom in */ { 0x0030, KEY_KPPLUS }, /* zoom in */
{ 0x31, KEY_KPMINUS }, /* zoom out */ { 0x0031, KEY_KPMINUS }, /* zoom out */
{ 0x32, KEY_F18 }, /* capture */ { 0x0032, KEY_F18 }, /* capture */
{ 0x33, KEY_F19 }, /* web */ { 0x0033, KEY_F19 }, /* web */
{ 0x34, KEY_EMAIL }, { 0x0034, KEY_EMAIL },
{ 0x35, KEY_PHONE }, { 0x0035, KEY_PHONE },
{ 0x36, KEY_PC }, { 0x0036, KEY_PC },
}; };
static struct rc_map_list nebula_map = { static struct rc_map_list nebula_map = {
.map = { .map = {
.scan = nebula, .scan = nebula,
.size = ARRAY_SIZE(nebula), .size = ARRAY_SIZE(nebula),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_type = RC_TYPE_RC5,
.name = RC_MAP_NEBULA, .name = RC_MAP_NEBULA,
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7