[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
Mauro Carvalho Chehab [Mon, 24 Jan 2011 15:18:47 +0000 (12:18 -0300)]
There are two "hauppauge-new" keymaps, one with protocol
unknown, and the other with the protocol marked accordingly.
However, both tables are miss-named.

Also, the old rc-hauppauge-new is broken, as it mixes
three different controllers as if they were just one.

This patch solves half of the problem by renaming the
correct keycode table as just rc-hauppauge. This table
contains the codes for the four different types of
remote controllers found on Hauppauge cards, properly
mapped with their different addresses.

 create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c
 delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
[Jarod: fix up RC_MAP_HAUPPAUGE defines]

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>

drivers/media/dvb/siano/sms-cards.c
drivers/media/rc/keymaps/Makefile
drivers/media/rc/keymaps/rc-hauppauge.c [moved from drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c with 93% similarity]
drivers/media/rc/mceusb.c
drivers/media/video/cx23885/cx23885-input.c
drivers/media/video/em28xx/em28xx-cards.c
include/media/rc-map.h

index 25b43e5..af121db 100644 (file)
@@ -64,7 +64,7 @@ static struct sms_board sms_boards[] = {
                .type   = SMS_NOVA_B0,
                .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
-               .rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
+               .rc_codes = RC_MAP_HAUPPAUGE,
                .board_cfg.leds_power = 26,
                .board_cfg.led0 = 27,
                .board_cfg.led1 = 28,
index cb72121..1f446f9 100644 (file)
@@ -68,7 +68,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-proteus-2309.o \
                        rc-purpletv.o \
                        rc-pv951.o \
-                       rc-rc5-hauppauge-new.o \
+                       rc-hauppauge.o \
                        rc-rc5-tv.o \
                        rc-rc6-mce.o \
                        rc-real-audio-220-32-keys.o \
similarity index 93%
rename from drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
rename to drivers/media/rc/keymaps/rc-hauppauge.c
index cb312da..cd3db77 100644 (file)
@@ -1,8 +1,14 @@
-/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller
+/* rc-hauppauge.c - Keytable for Hauppauge Remote Controllers
  *
  * keymap imported from ir-keymaps.c
  *
- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * This map currently contains the code for four different RCs:
+ *     - New Hauppauge Gray;
+ *     - Old Hauppauge Gray (with a golden screen for media keys);
+ *     - Hauppauge Black;
+ *     - DSR-0112 remote bundled with Haupauge MiniStick.
+ *
+ * Copyright (c) 2010-2011 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -214,7 +220,7 @@ static struct rc_map_list rc5_hauppauge_new_map = {
                .scan    = rc5_hauppauge_new,
                .size    = ARRAY_SIZE(rc5_hauppauge_new),
                .rc_type = RC_TYPE_RC5,
-               .name    = RC_MAP_RC5_HAUPPAUGE_NEW,
+               .name    = RC_MAP_HAUPPAUGE,
        }
 };
 
index e4f8eac..eedefce 100644 (file)
@@ -186,7 +186,7 @@ static const struct mceusb_model mceusb_model[] = {
                 * remotes, but we should have something handy,
                 * to allow testing it
                 */
-               .rc_map = RC_MAP_RC5_HAUPPAUGE_NEW,
+               .rc_map = RC_MAP_HAUPPAUGE,
                .name = "Conexant Hybrid TV (cx231xx) MCE IR",
        },
        [CX_HYBRID_TV] = {
index 199b996..e97cafd 100644 (file)
@@ -264,7 +264,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
                driver_type = RC_DRIVER_IR_RAW;
                allowed_protos = RC_TYPE_ALL;
                /* The grey Hauppauge RC-5 remote */
-               rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
+               rc_map = RC_MAP_HAUPPAUGE;
                break;
        case CX23885_BOARD_TEVII_S470:
                /* Integrated CX23885 IR controller */
index 87f77a3..aa4f45e 100644 (file)
@@ -911,7 +911,7 @@ struct em28xx_board em28xx_boards[] = {
                .mts_firmware   = 1,
                .has_dvb        = 1,
                .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-               .ir_codes       = RC_MAP_RC5_HAUPPAUGE_NEW,
+               .ir_codes       = RC_MAP_HAUPPAUGE,
                .decoder        = EM28XX_TVP5150,
                .input          = { {
                        .type     = EM28XX_VMUX_TELEVISION,
@@ -2430,7 +2430,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                break;
        case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-               dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
+               dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
                dev->init_data.get_key = em28xx_get_key_em_haup;
                dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
                break;
index d843afc..9184751 100644 (file)
@@ -94,7 +94,7 @@ void rc_map_init(void);
 #define RC_MAP_GADMEI_RM008Z             "rc-gadmei-rm008z"
 #define RC_MAP_GENIUS_TVGO_A11MCE        "rc-genius-tvgo-a11mce"
 #define RC_MAP_GOTVIEW7135               "rc-gotview7135"
-#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge-new"
+#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge"
 #define RC_MAP_IMON_MCE                  "rc-imon-mce"
 #define RC_MAP_IMON_PAD                  "rc-imon-pad"
 #define RC_MAP_IODATA_BCTV7E             "rc-iodata-bctv7e"
@@ -125,7 +125,7 @@ void rc_map_init(void);
 #define RC_MAP_PROTEUS_2309              "rc-proteus-2309"
 #define RC_MAP_PURPLETV                  "rc-purpletv"
 #define RC_MAP_PV951                     "rc-pv951"
-#define RC_MAP_RC5_HAUPPAUGE_NEW         "rc-rc5-hauppauge-new"
+#define RC_MAP_HAUPPAUGE                 "rc-hauppauge"
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"