From d6da1cba2f6a35dc9c78fd1b8cb84670cf05fd6f Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Thu, 7 Oct 2010 21:56:48 -0300
Subject: [PATCH] --- yaml --- r: 219295 b: refs/heads/master c:
 68617b31b39fdfd7920d55710994755e7259b16b h: refs/heads/master i:   219293:
 1b805706ec23bad5c6902f842ee51399d0271ebd   219291:
 f7f1eb3127981af8db2736cc6eed5bf21ea7ccf9   219287:
 b813045e70fcd5ff5f0aee6eef143aa034e633f5   219279:
 7d8b32d4e7d0ea54350c0d1d1edd35ce52ce7ced   219263:
 0add2cd36b73c5f2674775b0775720f1b158ddb7 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/IR/keymaps/Makefile       |  1 +
 .../media/IR/keymaps/rc-terratec-slim.c       | 79 +++++++++++++++++++
 trunk/include/media/rc-map.h                  |  1 +
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 trunk/drivers/media/IR/keymaps/rc-terratec-slim.c

diff --git a/[refs] b/[refs]
index 6e533c07050f..742230a7ea29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 675375d7ae14849d5698c771aff964a0ea2ac404
+refs/heads/master: 68617b31b39fdfd7920d55710994755e7259b16b
diff --git a/trunk/drivers/media/IR/keymaps/Makefile b/trunk/drivers/media/IR/keymaps/Makefile
index f755b21eef1a..1f85989d5af3 100644
--- a/trunk/drivers/media/IR/keymaps/Makefile
+++ b/trunk/drivers/media/IR/keymaps/Makefile
@@ -65,6 +65,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-streamzap.o \
 			rc-tbs-nec.o \
 			rc-terratec-cinergy-xs.o \
+			rc-terratec-slim.o \
 			rc-tevii-nec.o \
 			rc-tt-1500.o \
 			rc-videomate-s350.o \
diff --git a/trunk/drivers/media/IR/keymaps/rc-terratec-slim.c b/trunk/drivers/media/IR/keymaps/rc-terratec-slim.c
new file mode 100644
index 000000000000..70b08fe64079
--- /dev/null
+++ b/trunk/drivers/media/IR/keymaps/rc-terratec-slim.c
@@ -0,0 +1,79 @@
+/*
+ * TerraTec 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>
+
+/* TerraTec slim remote, 7 rows, 4 columns. */
+/* Uses NEC extended 0x02bd. */
+static struct ir_scancode terratec_slim[] = {
+	{ 0x02bd00, KEY_1 },
+	{ 0x02bd01, KEY_2 },
+	{ 0x02bd02, KEY_3 },
+	{ 0x02bd03, KEY_4 },
+	{ 0x02bd04, KEY_5 },
+	{ 0x02bd05, KEY_6 },
+	{ 0x02bd06, KEY_7 },
+	{ 0x02bd07, KEY_8 },
+	{ 0x02bd08, KEY_9 },
+	{ 0x02bd09, KEY_0 },
+	{ 0x02bd0a, KEY_MUTE },
+	{ 0x02bd0b, KEY_ZOOM },            /* symbol: PIP or zoom ? */
+	{ 0x02bd0e, KEY_VOLUMEDOWN },
+	{ 0x02bd0f, KEY_PLAYPAUSE },
+	{ 0x02bd10, KEY_RIGHT },
+	{ 0x02bd11, KEY_LEFT },
+	{ 0x02bd12, KEY_UP },
+	{ 0x02bd13, KEY_DOWN },
+	{ 0x02bd15, KEY_OK },
+	{ 0x02bd16, KEY_STOP },
+	{ 0x02bd17, KEY_CAMERA },          /* snapshot */
+	{ 0x02bd18, KEY_CHANNELUP },
+	{ 0x02bd19, KEY_RECORD },
+	{ 0x02bd1a, KEY_CHANNELDOWN },
+	{ 0x02bd1c, KEY_ESC },
+	{ 0x02bd1f, KEY_VOLUMEUP },
+	{ 0x02bd44, KEY_EPG },
+	{ 0x02bd45, KEY_POWER2 },          /* [red power button] */
+};
+
+static struct rc_keymap terratec_slim_map = {
+	.map = {
+		.scan    = terratec_slim,
+		.size    = ARRAY_SIZE(terratec_slim),
+		.ir_type = IR_TYPE_NEC,
+		.name    = RC_MAP_TERRATEC_SLIM,
+	}
+};
+
+static int __init init_rc_map_terratec_slim(void)
+{
+	return ir_register_map(&terratec_slim_map);
+}
+
+static void __exit exit_rc_map_terratec_slim(void)
+{
+	ir_unregister_map(&terratec_slim_map);
+}
+
+module_init(init_rc_map_terratec_slim)
+module_exit(exit_rc_map_terratec_slim)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
diff --git a/trunk/include/media/rc-map.h b/trunk/include/media/rc-map.h
index 57281b1008e4..5ba78f588bc6 100644
--- a/trunk/include/media/rc-map.h
+++ b/trunk/include/media/rc-map.h
@@ -122,6 +122,7 @@ void rc_map_init(void);
 #define RC_MAP_STREAMZAP                 "rc-streamzap"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 #define RC_MAP_TERRATEC_CINERGY_XS       "rc-terratec-cinergy-xs"
+#define RC_MAP_TERRATEC_SLIM             "rc-terratec-slim"
 #define RC_MAP_TEVII_NEC                 "rc-tevii-nec"
 #define RC_MAP_TT_1500                   "rc-tt-1500"
 #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"