2 files changed, 41 insertions, 58 deletions

diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 49c2a817a06f..461714396331 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -35,7 +35,7 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/spinlock.h>
-#include <media/ir-common.h>
+#include <media/ir-core.h>
 
 #include "budget.h"
 
@@ -54,6 +54,8 @@
 #include "tda1002x.h"
 #include "tda827x.h"
 
+#define MODULE_NAME "budget_ci"
+
 /*
  * Regarding DEBIADDR_IR:
  * Some CI modules hang if random addresses are read.
@@ -80,12 +82,6 @@
 #define SLOTSTATUS_READY        8
 #define SLOTSTATUS_OCCUPIED     (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)
 
-/*
- * Milliseconds during which a key is regarded as pressed.
- * If an identical command arrives within this time, the timer will start over.
- */
-#define IR_KEYPRESS_TIMEOUT     250
-
 /* RC5 device wildcard */
 #define IR_DEVICE_ANY           255
 
@@ -102,12 +98,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 struct budget_ci_ir {
         struct input_dev *dev;
         struct tasklet_struct msp430_irq_tasklet;
-        struct timer_list timer_keyup;
         char name[72]; /* 40 + 32 for (struct saa7146_dev).name */
         char phys[32];
-        struct ir_input_state state;
         int rc5_device;
-        u32 last_raw;
         u32 ir_key;
         bool have_command;
 };
@@ -122,18 +115,11 @@ struct budget_ci {
         u8 tuner_pll_address; /* used for philips_tdm1316l configs */
 };
 
-static void msp430_ir_keyup(unsigned long data)
-{
-        struct budget_ci_ir *ir = (struct budget_ci_ir *) data;
-        ir_input_nokey(ir->dev, &ir->state);
-}
-
 static void msp430_ir_interrupt(unsigned long data)
 {
         struct budget_ci *budget_ci = (struct budget_ci *) data;
         struct input_dev *dev = budget_ci->ir.dev;
         u32 command = ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8;
-        u32 raw;
 
         /*
          * The msp430 chip can generate two different bytes, command and device
@@ -169,20 +155,12 @@ static void msp430_ir_interrupt(unsigned long data)
                 return;
         budget_ci->ir.have_command = false;
 
+        /* FIXME: We should generate complete scancodes with device info */
         if (budget_ci->ir.rc5_device != IR_DEVICE_ANY &&
             budget_ci->ir.rc5_device != (command & 0x1f))
                 return;
 
-        /* Is this a repeated key sequence? (same device, command, toggle) */
-        raw = budget_ci->ir.ir_key | (command << 8);
-        if (budget_ci->ir.last_raw != raw || !timer_pending(&budget_ci->ir.timer_keyup)) {
-                ir_input_nokey(dev, &budget_ci->ir.state);
-                ir_input_keydown(dev, &budget_ci->ir.state,
-                                 budget_ci->ir.ir_key);
-                budget_ci->ir.last_raw = raw;
-        }
-
-        mod_timer(&budget_ci->ir.timer_keyup, jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT));
+        ir_keydown(dev, budget_ci->ir.ir_key, (command & 0x20) ? 1 : 0);
 }
 
 static int msp430_ir_init(struct budget_ci *budget_ci)
@@ -190,7 +168,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         struct saa7146_dev *saa = budget_ci->budget.dev;
         struct input_dev *input_dev = budget_ci->ir.dev;
         int error;
-        struct ir_scancode_table *ir_codes;
+        char *ir_codes = NULL;
 
 
         budget_ci->ir.dev = input_dev = input_allocate_device();
@@ -230,7 +208,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1011:
         case 0x1012:
                 /* The hauppauge keymap is a superset of these remotes */
-                ir_codes = &ir_codes_hauppauge_new_table;
+                ir_codes = RC_MAP_HAUPPAUGE_NEW;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = 0x1f;
@@ -239,22 +217,15 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1017:
         case 0x101a:
                 /* for the Technotrend 1500 bundled remote */
-                ir_codes = &ir_codes_tt_1500_table;
+                ir_codes = RC_MAP_TT_1500;
                 break;
         default:
                 /* unknown remote */
-                ir_codes = &ir_codes_budget_ci_old_table;
+                ir_codes = RC_MAP_BUDGET_CI_OLD;
                 break;
         }
 
-        ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5);
-
-        /* initialise the key-up timeout handler */
-        init_timer(&budget_ci->ir.timer_keyup);
-        budget_ci->ir.timer_keyup.function = msp430_ir_keyup;
-        budget_ci->ir.timer_keyup.data = (unsigned long) &budget_ci->ir;
-        budget_ci->ir.last_raw = 0xffff; /* An impossible value */
-        error = ir_input_register(input_dev, ir_codes, NULL);
+        error = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
         if (error) {
                 printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);
                 return error;
@@ -282,9 +253,6 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)
         saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
         tasklet_kill(&budget_ci->ir.msp430_irq_tasklet);
 
-        del_timer_sync(&dev->timer);
-        ir_input_nokey(dev, &budget_ci->ir.state);
-
         ir_input_unregister(dev);
 }
 
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 1500210c06cf..874a10a9d493 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -442,6 +442,7 @@ static struct stv090x_config tt1600_stv090x_config = {
         .repeater_level         = STV090x_RPTLEVEL_16,
 
         .tuner_init             = NULL,
+        .tuner_sleep            = NULL,
         .tuner_set_mode         = NULL,
         .tuner_set_frequency    = NULL,
         .tuner_get_frequency    = NULL,
@@ -627,22 +628,36 @@ static void frontend_init(struct budget *budget)
                                                  &tt1600_stv6110x_config,
                                                  &budget->i2c_adap);
 
-                                tt1600_stv090x_config.tuner_init          = ctl->tuner_init;
-                                tt1600_stv090x_config.tuner_set_mode      = ctl->tuner_set_mode;
-                                tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
-                                tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
-                                tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
-                                tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
-                                tt1600_stv090x_config.tuner_set_bbgain    = ctl->tuner_set_bbgain;
-                                tt1600_stv090x_config.tuner_get_bbgain    = ctl->tuner_get_bbgain;
-                                tt1600_stv090x_config.tuner_set_refclk    = ctl->tuner_set_refclk;
-                                tt1600_stv090x_config.tuner_get_status    = ctl->tuner_get_status;
-
-                                dvb_attach(isl6423_attach,
-                                        budget->dvb_frontend,
-                                        &budget->i2c_adap,
-                                        &tt1600_isl6423_config);
-
+                                if (ctl) {
+                                        tt1600_stv090x_config.tuner_init          = ctl->tuner_init;
+                                        tt1600_stv090x_config.tuner_sleep         = ctl->tuner_sleep;
+                                        tt1600_stv090x_config.tuner_set_mode      = ctl->tuner_set_mode;
+                                        tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
+                                        tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
+                                        tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
+                                        tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
+                                        tt1600_stv090x_config.tuner_set_bbgain    = ctl->tuner_set_bbgain;
+                                        tt1600_stv090x_config.tuner_get_bbgain    = ctl->tuner_get_bbgain;
+                                        tt1600_stv090x_config.tuner_set_refclk    = ctl->tuner_set_refclk;
+                                        tt1600_stv090x_config.tuner_get_status    = ctl->tuner_get_status;
+
+                                        /* call the init function once to initialize
+                                           tuner's clock output divider and demod's
+                                           master clock */
+                                        if (budget->dvb_frontend->ops.init)
+                                                budget->dvb_frontend->ops.init(budget->dvb_frontend);
+
+                                        if (dvb_attach(isl6423_attach,
+                                                       budget->dvb_frontend,
+                                                       &budget->i2c_adap,
+                                                       &tt1600_isl6423_config) == NULL) {
+                                                printk(KERN_ERR "%s: No Intersil ISL6423 found!\n", __func__);
+                                                goto error_out;
+                                        }
+                                } else {
+                                        printk(KERN_ERR "%s: No STV6110(A) Silicon Tuner found!\n", __func__);
+                                        goto error_out;
+                                }
                         }
                 }
                 break;