V4L/DVB (6179): Clean up FusionHDTV ir code
- fixed missing buttons in keymap.
- make function names & descriptions more generic,
since this same ir receiver and remote is used in
many FusionHDTV products.
- miscellaneous cleanups.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 3d5a28c..04f6eb5 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -143,7 +143,7 @@
return 1;
}
-static int get_key_fusion_gold(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{
unsigned char buf[4];
@@ -154,7 +154,7 @@
}
if(buf[0] !=0 || buf[1] !=0 || buf[2] !=0 || buf[3] != 0)
- dprintk(2, "ir fusion gold: 0x%2x 0x%2x 0x%2x 0x%2x\n",
+ dprintk(2, "%s: 0x%2x 0x%2x 0x%2x 0x%2x\n", __FUNCTION__,
buf[0], buf[1], buf[2], buf[3]);
/* no key pressed or signal from other ir remote */
@@ -165,10 +165,8 @@
*ir_raw = (buf[2] << 8) | buf[3];
return 1;
-
}
-
static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{
unsigned char b;
@@ -392,10 +390,10 @@
ir_codes = ir_codes_empty;
break;
case 0x6b:
- name = "FusionGold";
- ir->get_key = get_key_fusion_gold;
+ name = "FusionHDTV";
+ ir->get_key = get_key_fusionhdtv;
ir_type = IR_TYPE_RC5;
- ir_codes = ir_codes_fusion_gold;
+ ir_codes = ir_codes_fusionhdtv_mce;
break;
case 0x7a:
case 0x47: