[media] rename rc-msi-digivox.c -> rc-msi-digivox-iii.c

Rename remote controller driver I added earlier.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index c3a8ab8..8053b20 100644 (file)
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -46,8 +46,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-lirc.o \
                        rc-lme2510.o \
                        rc-manli.o \
-                       rc-msi-digivox.o \
                        rc-msi-digivox-ii.o \
+                       rc-msi-digivox-iii.o \
                        rc-msi-tvanywhere.o \
                        rc-msi-tvanywhere-plus.o \
                        rc-nebula.o \

diff --git a/drivers/media/IR/keymaps/rc-msi-digivox-iii.c b/drivers/media/IR/keymaps/rc-msi-digivox-iii.c
new file mode 100644 (file)
index 0000000..8ea3960
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-msi-digivox-iii.c
@@ -0,0 +1,85 @@
+/*
+ * MSI DIGIVOX mini III remote controller keytable
+ *
+ * Copyright (C) 2010 Antti Palosaari <crope@iki.fi>
+ *
+ *    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
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License along
+ *    with this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <media/rc-map.h>
+
+/* MSI DIGIVOX mini III */
+/* Uses NEC extended 0x61d6. */
+/* This remote seems to be same as rc-kworld-315u.c. Anyhow, add new remote
+   since rc-kworld-315u.c lacks NEC extended address byte. */
+static struct ir_scancode msi_digivox_iii[] = {
+       { 0x61d601, KEY_VIDEO },           /* Source */
+       { 0x61d602, KEY_3 },
+       { 0x61d603, KEY_POWER2 },          /* ShutDown */
+       { 0x61d604, KEY_1 },
+       { 0x61d605, KEY_5 },
+       { 0x61d606, KEY_6 },
+       { 0x61d607, KEY_CHANNELDOWN },     /* CH- */
+       { 0x61d608, KEY_2 },
+       { 0x61d609, KEY_CHANNELUP },       /* CH+ */
+       { 0x61d60a, KEY_9 },
+       { 0x61d60b, KEY_ZOOM },            /* Zoom */
+       { 0x61d60c, KEY_7 },
+       { 0x61d60d, KEY_8 },
+       { 0x61d60e, KEY_VOLUMEUP },        /* Vol+ */
+       { 0x61d60f, KEY_4 },
+       { 0x61d610, KEY_ESC },             /* [back up arrow] */
+       { 0x61d611, KEY_0 },
+       { 0x61d612, KEY_OK },              /* [enter arrow] */
+       { 0x61d613, KEY_VOLUMEDOWN },      /* Vol- */
+       { 0x61d614, KEY_RECORD },          /* Rec */
+       { 0x61d615, KEY_STOP },            /* Stop */
+       { 0x61d616, KEY_PLAY },            /* Play */
+       { 0x61d617, KEY_MUTE },            /* Mute */
+       { 0x61d618, KEY_UP },
+       { 0x61d619, KEY_DOWN },
+       { 0x61d61a, KEY_LEFT },
+       { 0x61d61b, KEY_RIGHT },
+       { 0x61d61c, KEY_RED },
+       { 0x61d61d, KEY_GREEN },
+       { 0x61d61e, KEY_YELLOW },
+       { 0x61d61f, KEY_BLUE },
+       { 0x61d643, KEY_POWER },           /* [red power button] */
+};
+
+static struct rc_keymap msi_digivox_iii_map = {
+       .map = {
+               .scan    = msi_digivox_iii,
+               .size    = ARRAY_SIZE(msi_digivox_iii),
+               .ir_type = IR_TYPE_NEC,
+               .name    = RC_MAP_MSI_DIGIVOX_III,
+       }
+};
+
+static int __init init_rc_map_msi_digivox_iii(void)
+{
+       return ir_register_map(&msi_digivox_iii_map);
+}
+
+static void __exit exit_rc_map_msi_digivox_iii(void)
+{
+       ir_unregister_map(&msi_digivox_iii_map);
+}
+
+module_init(init_rc_map_msi_digivox_iii)
+module_exit(exit_rc_map_msi_digivox_iii)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");

diff --git a/drivers/media/IR/keymaps/rc-msi-digivox.c b/drivers/media/IR/keymaps/rc-msi-digivox.c
deleted file mode 100644 (file)
index 3ba3140..0000000
--- a/drivers/media/IR/keymaps/rc-msi-digivox.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * MSI DIGIVOX mini III remote controller keytable
- *
- * Copyright (C) 2010 Antti Palosaari <crope@iki.fi>
- *
- *    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
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License along
- *    with this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <media/rc-map.h>
-
-/* MSI DIGIVOX mini III */
-/* Uses NEC extended 0x61d6. */
-/* This remote seems to be same as rc-kworld-315u.c. Anyhow, add new remote
-   since rc-kworld-315u.c lacks NEC extended address byte. */
-static struct ir_scancode msi_digivox[] = {
-       { 0x61d601, KEY_VIDEO },           /* Source */
-       { 0x61d602, KEY_3 },
-       { 0x61d603, KEY_POWER2 },          /* ShutDown */
-       { 0x61d604, KEY_1 },
-       { 0x61d605, KEY_5 },
-       { 0x61d606, KEY_6 },
-       { 0x61d607, KEY_CHANNELDOWN },     /* CH- */
-       { 0x61d608, KEY_2 },
-       { 0x61d609, KEY_CHANNELUP },       /* CH+ */
-       { 0x61d60a, KEY_9 },
-       { 0x61d60b, KEY_ZOOM },            /* Zoom */
-       { 0x61d60c, KEY_7 },
-       { 0x61d60d, KEY_8 },
-       { 0x61d60e, KEY_VOLUMEUP },        /* Vol+ */
-       { 0x61d60f, KEY_4 },
-       { 0x61d610, KEY_ESC },             /* [back up arrow] */
-       { 0x61d611, KEY_0 },
-       { 0x61d612, KEY_OK },              /* [enter arrow] */
-       { 0x61d613, KEY_VOLUMEDOWN },      /* Vol- */
-       { 0x61d614, KEY_RECORD },          /* Rec */
-       { 0x61d615, KEY_STOP },            /* Stop */
-       { 0x61d616, KEY_PLAY },            /* Play */
-       { 0x61d617, KEY_MUTE },            /* Mute */
-       { 0x61d618, KEY_UP },
-       { 0x61d619, KEY_DOWN },
-       { 0x61d61a, KEY_LEFT },
-       { 0x61d61b, KEY_RIGHT },
-       { 0x61d61c, KEY_RED },
-       { 0x61d61d, KEY_GREEN },
-       { 0x61d61e, KEY_YELLOW },
-       { 0x61d61f, KEY_BLUE },
-       { 0x61d643, KEY_POWER },           /* [red power button] */
-};
-
-static struct rc_keymap msi_digivox_map = {
-       .map = {
-               .scan    = msi_digivox,
-               .size    = ARRAY_SIZE(msi_digivox),
-               .ir_type = IR_TYPE_NEC,
-               .name    = RC_MAP_MSI_DIGIVOX,
-       }
-};
-
-static int __init init_rc_map_msi_digivox(void)
-{
-       return ir_register_map(&msi_digivox_map);
-}
-
-static void __exit exit_rc_map_msi_digivox(void)
-{
-       ir_unregister_map(&msi_digivox_map);
-}
-
-module_init(init_rc_map_msi_digivox)
-module_exit(exit_rc_map_msi_digivox)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");

diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index b319923..f9fe29a 100644 (file)
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -103,8 +103,8 @@ void rc_map_init(void);
 #define RC_MAP_LIRC                      "rc-lirc"
 #define RC_MAP_LME2510                   "rc-lme2510"
 #define RC_MAP_MANLI                     "rc-manli"
-#define RC_MAP_MSI_DIGIVOX               "rc-msi-digivox"
 #define RC_MAP_MSI_DIGIVOX_II            "rc-msi-digivox-ii"
+#define RC_MAP_MSI_DIGIVOX_III           "rc-msi-digivox-iii"
 #define RC_MAP_MSI_TVANYWHERE_PLUS       "rc-msi-tvanywhere-plus"
 #define RC_MAP_MSI_TVANYWHERE            "rc-msi-tvanywhere"
 #define RC_MAP_NEBULA                    "rc-nebula"