5 files changed, 47 insertions, 277 deletions

diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 94a8577e72eb..15a0f192d413 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -497,8 +497,9 @@ int __ir_input_register(struct input_dev *input_dev,
                                 goto out_event;
                 }
 
-        IR_dprintk(1, "Registered input device on %s for %s remote.\n",
-                   driver_name, rc_tab->name);
+        IR_dprintk(1, "Registered input device on %s for %s remote%s.\n",
+                   driver_name, rc_tab->name,
+                   ir_dev->props->driver_type == RC_DRIVER_IR_RAW ? " in raw mode" : "");
 
         return 0;
 
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index dcde60645960..25b43e587fa6 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -64,6 +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,
                 .board_cfg.leds_power = 26,
                 .board_cfg.led0 = 27,
                 .board_cfg.led1 = 28,
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h
index 8f19fc000b46..d8cdf756f7cf 100644
--- a/drivers/media/dvb/siano/sms-cards.h
+++ b/drivers/media/dvb/siano/sms-cards.h
@@ -75,7 +75,7 @@ struct sms_board {
         enum sms_device_type_st type;
         char *name, *fw[DEVICE_MODE_MAX];
         struct sms_board_gpio_cfg board_cfg;
-        enum ir_kb_type ir_kb_type;
+        char *rc_codes;                         /* Name of IR codes table */
 
         /* gpios */
         int led_power, led_hi, led_lo, lna_ctrl, rf_switch;
diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/dvb/siano/smsir.c
index f8a4fd61e3dc..d0e4639ee9db 100644
--- a/drivers/media/dvb/siano/smsir.c
+++ b/drivers/media/dvb/siano/smsir.c
@@ -4,6 +4,11 @@
  MDTV receiver kernel modules.
  Copyright (C) 2006-2009, Uri Shkolnik
 
+ Copyright (c) 2010 - Mauro Carvalho Chehab
+        - Ported the driver to use rc-core
+        - IR raw event decoding is now done at rc-core
+        - Code almost re-written
+
  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
@@ -22,227 +27,27 @@
 
 #include <linux/types.h>
 #include <linux/input.h>
-#include <media/ir-core.h>
 
 #include "smscoreapi.h"
 #include "smsir.h"
 #include "sms-cards.h"
 
-/* In order to add new IR remote control -
- * 1) Add it to the <enum ir_kb_type> @ smsir,h,
- * 2) Add its map to keyboard_layout_maps below
- * 3) Set your board (sms-cards sub-module) to use it
- */
-
-static struct keyboard_layout_map_t keyboard_layout_maps[] = {
-                [SMS_IR_KB_DEFAULT_TV] = {
-                        .ir_protocol = IR_RC5,
-                        .rc5_kbd_address = KEYBOARD_ADDRESS_TV1,
-                        .keyboard_layout_map = {
-                                        KEY_0, KEY_1, KEY_2,
-                                        KEY_3, KEY_4, KEY_5,
-                                        KEY_6, KEY_7, KEY_8,
-                                        KEY_9, 0, 0, KEY_POWER,
-                                        KEY_MUTE, 0, 0,
-                                        KEY_VOLUMEUP, KEY_VOLUMEDOWN,
-                                        KEY_BRIGHTNESSUP,
-                                        KEY_BRIGHTNESSDOWN, KEY_CHANNELUP,
-                                        KEY_CHANNELDOWN,
-                                        0, 0, 0, 0, 0, 0, 0, 0,
-                                        0, 0, 0, 0, 0, 0, 0, 0,
-                                        0, 0, 0, 0, 0, 0, 0, 0,
-                                        0, 0, 0, 0, 0, 0, 0, 0,
-                                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-                        }
-                },
-                [SMS_IR_KB_HCW_SILVER] = {
-                        .ir_protocol = IR_RC5,
-                        .rc5_kbd_address = KEYBOARD_ADDRESS_LIGHTING1,
-                        .keyboard_layout_map = {
-                                        KEY_0, KEY_1, KEY_2,
-                                        KEY_3, KEY_4, KEY_5,
-                                        KEY_6, KEY_7, KEY_8,
-                                        KEY_9, KEY_TEXT, KEY_RED,
-                                        KEY_RADIO, KEY_MENU,
-                                        KEY_SUBTITLE,
-                                        KEY_MUTE, KEY_VOLUMEUP,
-                                        KEY_VOLUMEDOWN, KEY_PREVIOUS, 0,
-                                        KEY_UP, KEY_DOWN, KEY_LEFT,
-                                        KEY_RIGHT, KEY_VIDEO, KEY_AUDIO,
-                                        KEY_MHP, KEY_EPG, KEY_TV,
-                                        0, KEY_NEXTSONG, KEY_EXIT,
-                                        KEY_CHANNELUP,  KEY_CHANNELDOWN,
-                                        KEY_CHANNEL, 0,
-                                        KEY_PREVIOUSSONG, KEY_ENTER,
-                                        KEY_SLEEP, 0, 0, KEY_BLUE,
-                                        0, 0, 0, 0, KEY_GREEN, 0,
-                                        KEY_PAUSE, 0, KEY_REWIND,
-                                        0, KEY_FASTFORWARD, KEY_PLAY,
-                                        KEY_STOP, KEY_RECORD,
-                                        KEY_YELLOW, 0, 0, KEY_SELECT,
-                                        KEY_ZOOM, KEY_POWER, 0, 0
-                        }
-                },
-                { } /* Terminating entry */
-};
-
-static u32 ir_pos;
-static u32 ir_word;
-static u32 ir_toggle;
-
-#define RC5_PUSH_BIT(dst, bit, pos)     \
-        { dst <<= 1; dst |= bit; pos++; }
-
-
-static void sms_ir_rc5_event(struct smscore_device_t *coredev,
-                                u32 toggle, u32 addr, u32 cmd)
-{
-        bool toggle_changed;
-        u16 keycode;
-
-        sms_log("IR RC5 word: address %d, command %d, toggle %d",
-                                addr, cmd, toggle);
-
-        toggle_changed = ir_toggle != toggle;
-        /* keep toggle */
-        ir_toggle = toggle;
-
-        if (addr !=
-                keyboard_layout_maps[coredev->ir.ir_kb_type].rc5_kbd_address)
-                return; /* Check for valid address */
+#define MODULE_NAME "smsmdtv"
 
-        keycode =
-                keyboard_layout_maps
-                [coredev->ir.ir_kb_type].keyboard_layout_map[cmd];
-
-        if (!toggle_changed &&
-                        (keycode != KEY_VOLUMEUP && keycode != KEY_VOLUMEDOWN))
-                return; /* accept only repeated volume, reject other keys */
-
-        sms_log("kernel input keycode (from ir) %d", keycode);
-        input_report_key(coredev->ir.input_dev, keycode, 1);
-        input_sync(coredev->ir.input_dev);
-
-}
-
-/* decode raw bit pattern to RC5 code */
-/* taken from ir-functions.c */
-static u32 ir_rc5_decode(unsigned int code)
+void sms_ir_event(struct smscore_device_t *coredev, const char *buf, int len)
 {
-/*      unsigned int org_code = code;*/
-        unsigned int pair;
-        unsigned int rc5 = 0;
         int i;
+        const s32 *samples = (const void *)buf;
 
-        for (i = 0; i < 14; ++i) {
+        for (i = 0; i < len >> 2; i++) {