korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB: ir-core: re-add some debug functions for keytable changes

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-04-03 16:53:16 -03:00
parent b3074c0a3f
commit 354389467b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/IR/ir-keytable.c
View File

@ -100,6 +100,8 @@ static int ir_do_setkeycode(struct input_dev *dev,
/* Did the user wish to remove the mapping? */ /* Did the user wish to remove the mapping? */
if (keycode == KEY_RESERVED || keycode == KEY_UNKNOWN) { if (keycode == KEY_RESERVED || keycode == KEY_UNKNOWN) {
IR_dprintk(1, "#%d: Deleting scan 0x%04x\n",
i, scancode);
rc_tab->len--; rc_tab->len--;
memmove(&rc_tab->scan[i], &rc_tab->scan[i + 1], memmove(&rc_tab->scan[i], &rc_tab->scan[i + 1],
(rc_tab->len - i) * sizeof(struct ir_scancode)); (rc_tab->len - i) * sizeof(struct ir_scancode));
@ -115,6 +117,9 @@ static int ir_do_setkeycode(struct input_dev *dev,
if (ir_resize_table(rc_tab)) if (ir_resize_table(rc_tab))
return -ENOMEM; return -ENOMEM;
IR_dprintk(1, "#%d: New scan 0x%04x with key 0x%04x\n",
i, scancode, keycode);
/* i is the proper index to insert our new keycode */ /* i is the proper index to insert our new keycode */
memmove(&rc_tab->scan[i + 1], &rc_tab->scan[i], memmove(&rc_tab->scan[i + 1], &rc_tab->scan[i],
(rc_tab->len - i) * sizeof(struct ir_scancode)); (rc_tab->len - i) * sizeof(struct ir_scancode));
@ -123,6 +128,8 @@ static int ir_do_setkeycode(struct input_dev *dev,
rc_tab->len++; rc_tab->len++;
set_bit(keycode, dev->keybit); set_bit(keycode, dev->keybit);
} else { } else {
IR_dprintk(1, "#%d: Replacing scan 0x%04x with key 0x%04x\n",
i, scancode, keycode);
/* A previous mapping was updated... */ /* A previous mapping was updated... */
clear_bit(old_keycode, dev->keybit); clear_bit(old_keycode, dev->keybit);
/* ...but another scancode might use the same keycode */ /* ...but another scancode might use the same keycode */
@ -224,6 +231,10 @@ static int ir_getkeycode(struct input_dev *dev,
} }
spin_unlock_irqrestore(&rc_tab->lock, flags); spin_unlock_irqrestore(&rc_tab->lock, flags);
if (key == KEY_RESERVED)
IR_dprintk(1, "unknown key for scancode 0x%04x\n",
scancode);
*keycode = key; *keycode = key;
return 0; return 0;
} }
@ -243,6 +254,7 @@ u32 ir_g_keycode_from_table(struct input_dev *dev, u32 scancode)
int keycode; int keycode;
ir_getkeycode(dev, scancode, &keycode); ir_getkeycode(dev, scancode, &keycode);
if (keycode != KEY_RESERVED)
IR_dprintk(1, "%s: scancode 0x%04x keycode 0x%02x\n", IR_dprintk(1, "%s: scancode 0x%04x keycode 0x%02x\n",
dev->name, scancode, keycode); dev->name, scancode, keycode);
return keycode; return keycode;
@ -386,6 +398,9 @@ int __ir_input_register(struct input_dev *input_dev,
if (rc < 0) if (rc < 0)
goto out_table; goto out_table;
IR_dprintk(1, "Registered input device on %s for %s remote.\n",
driver_name, rc_tab->name);
return 0; return 0;
out_table: out_table: