5 files changed, 204 insertions, 121 deletions

diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 1a4a89fdf767..7da5c2e1fc12 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,10 +1,10 @@
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
+        depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
         select I2C_ALGOBIT
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
-        depends on VIDEO_IR
+        depends on RC_CORE
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 0902ec041c7a..849cd170b821 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -55,7 +55,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
-#include <media/rds.h>
+#include <media/saa6588.h>
 
 
 unsigned int bttv_num;                  /* number of Bt848s in use */
@@ -2597,31 +2597,6 @@ static int bttv_s_fmt_vid_overlay(struct file *file, void *priv,
         return setup_window_lock(fh, btv, &f->fmt.win, 1);
 }
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
-{
-        int retval;
-        unsigned int i;
-        struct bttv_fh *fh = priv;
-
-        retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
-                                     V4L2_MEMORY_MMAP);
-        if (retval < 0) {
-                return retval;
-        }
-
-        gbuffers = retval;
-        memset(mbuf, 0, sizeof(*mbuf));
-        mbuf->frames = gbuffers;
-        mbuf->size   = gbuffers * gbufsize;
-
-        for (i = 0; i < gbuffers; i++)
-                mbuf->offsets[i] = i * gbufsize;
-
-        return 0;
-}
-#endif
-
 static int bttv_querycap(struct file *file, void  *priv,
                                 struct v4l2_capability *cap)
 {
@@ -3354,9 +3329,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = {
         .vidioc_streamoff               = bttv_streamoff,
         .vidioc_g_tuner                 = bttv_g_tuner,
         .vidioc_s_tuner                 = bttv_s_tuner,
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        .vidiocgmbuf                    = vidiocgmbuf,
-#endif
         .vidioc_g_crop                  = bttv_g_crop,
         .vidioc_s_crop                  = bttv_s_crop,
         .vidioc_g_fbuf                  = bttv_g_fbuf,
@@ -3416,7 +3388,7 @@ static int radio_release(struct file *file)
 {
         struct bttv_fh *fh = file->private_data;
         struct bttv *btv = fh->btv;
-        struct rds_command cmd;
+        struct saa6588_command cmd;
 
         v4l2_prio_close(&btv->prio, fh->prio);
         file->private_data = NULL;
@@ -3424,7 +3396,7 @@ static int radio_release(struct file *file)
 
         btv->radio_user--;
 
-        bttv_call_all(btv, core, ioctl, RDS_CMD_CLOSE, &cmd);
+        bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
         return 0;
 }
@@ -3551,13 +3523,13 @@ static ssize_t radio_read(struct file *file, char __user *data,
 {
         struct bttv_fh *fh = file->private_data;
         struct bttv *btv = fh->btv;
-        struct rds_command cmd;
+        struct saa6588_command cmd;
         cmd.block_count = count/3;
         cmd.buffer = data;
         cmd.instance = file;
         cmd.result = -ENODEV;
 
-        bttv_call_all(btv, core, ioctl, RDS_CMD_READ, &cmd);
+        bttv_call_all(btv, core, ioctl, SAA6588_CMD_READ, &cmd);
 
         return cmd.result;
 }
@@ -3566,11 +3538,11 @@ static unsigned int radio_poll(struct file *file, poll_table *wait)
 {
         struct bttv_fh *fh = file->private_data;
         struct bttv *btv = fh->btv;
-        struct rds_command cmd;
+        struct saa6588_command cmd;
         cmd.instance = file;
         cmd.event_list = wait;
         cmd.result = -ENODEV;
-        bttv_call_all(btv, core, ioctl, RDS_CMD_POLL, &cmd);
+        bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);
 
         return cmd.result;
 }
@@ -4041,9 +4013,6 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
 
         btv=(struct bttv *)dev_id;
 
-        if (btv->custom_irq)
-                handled = btv->custom_irq(btv);
-
         count=0;
         while (1) {
                 /* get/clear interrupt status bits */
@@ -4079,7 +4048,6 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
                         btv->field_count++;
 
                 if ((astat & BT848_INT_GPINT) && btv->remote) {
-                        wake_up(&btv->gpioq);
                         bttv_input_irq(btv);
                 }
 
@@ -4284,7 +4252,6 @@ static int __devinit bttv_probe(struct pci_dev *dev,
         mutex_init(&btv->lock);
         spin_lock_init(&btv->s_lock);
         spin_lock_init(&btv->gpio_lock);
-        init_waitqueue_head(&btv->gpioq);
         init_waitqueue_head(&btv->i2c_queue);
         INIT_LIST_HEAD(&btv->c.subs);
         INIT_LIST_HEAD(&btv->capture);
@@ -4472,7 +4439,6 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
 
         /* tell gpio modules we are leaving ... */
         btv->shutdown=1;
-        wake_up(&btv->gpioq);
         bttv_input_fini(btv);
         bttv_sub_del_devices(&btv->c);
 
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 6bf05a7dc5f9..97793b960600 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -31,15 +31,9 @@
 
 static int ir_debug;
 module_param(ir_debug, int, 0644);
-static int repeat_delay = 500;
-module_param(repeat_delay, int, 0644);
-static int repeat_period = 33;
-module_param(repeat_period, int, 0644);
 
 static int ir_rc5_remote_gap = 885;
 module_param(ir_rc5_remote_gap, int, 0644);
-static int ir_rc5_key_timeout = 200;
-module_param(ir_rc5_key_timeout, int, 0644);
 
 #undef dprintk
 #define dprintk(arg...) do {    \
@@ -55,7 +49,7 @@ module_param(ir_rc5_key_timeout, int, 0644);
 
 static void ir_handle_key(struct bttv *btv)
 {
-        struct card_ir *ir = btv->remote;
+        struct bttv_ir *ir = btv->remote;
         u32 gpio,data;
 
         /* read gpio value */
@@ -74,23 +68,22 @@ static void ir_handle_key(struct bttv *btv)
                 (gpio & ir->mask_keydown) ? " down" : "",
                 (gpio & ir->mask_keyup)   ? " up"   : "");
 
-        if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
-            (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
-                ir_input_keydown(ir->dev, &ir->ir, data);
+        if ((ir->mask_keydown && (gpio & ir->mask_keydown)) ||
+            (ir->mask_keyup   && !(gpio & ir->mask_keyup))) {
+                rc_keydown_notimeout(ir->dev, data, 0);
         } else {
                 /* HACK: Probably, ir->mask_keydown is missing
                    for this board */
                 if (btv->c.type == BTTV_BOARD_WINFAST2000)
-                        ir_input_keydown(ir->dev, &ir->ir, data);
+                        rc_keydown_notimeout(ir->dev, data, 0);
 
-                ir_input_nokey(ir->dev,&ir->ir);
+                rc_keyup(ir->dev);
         }
-
 }
 
 static void ir_enltv_handle_key(struct bttv *btv)
 {
-        struct card_ir *ir = btv->remote;
+        struct bttv_ir *ir = btv->remote;
         u32 gpio, data, keyup;
 
         /* read gpio value */
@@ -107,9 +100,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
                         gpio, data,
                         (gpio & ir->mask_keyup) ? " up" : "up/down");
 
-                ir_input_keydown(ir->dev, &ir->ir, data);
+                rc_keydown_notimeout(ir->dev, data, 0);
                 if (keyup)
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        rc_keyup(ir->dev);
         } else {
                 if ((ir->last_gpio & 1 << 31) == keyup)
                         return;
@@ -119,26 +112,30 @@ static void ir_enltv_handle_key(struct bttv *btv)
                         (gpio & ir->mask_keyup) ? " up" : "down");
 
                 if (keyup)
-                        ir_input_nokey(ir->dev, &ir->ir);
+                        rc_keyup(ir->dev);
                 else
-                        ir_input_keydown(ir->dev, &ir->ir, data);
+                        rc_keydown_notimeout(ir->dev, data, 0);
         }
 
         ir->last_gpio = data | keyup;
 }
 
+static int bttv_rc5_irq(struct bttv *btv);
+
 void bttv_input_irq(struct bttv *btv)
 {
-        struct card_ir *ir = btv->remote;
+        struct bttv_ir *ir = btv->remote;
 
-        if (!ir->polling)
+        if (ir->rc5_gpio)
+                bttv_rc5_irq(btv);
+        else if (!ir->polling)
                 ir_handle_key(btv);
 }
 
 static void bttv_input_timer(unsigned long data)
 {
         struct bttv *btv = (struct bttv*)data;
-        struct card_ir *ir = btv->remote;
+        struct bttv_ir *ir = btv->remote;
 
         if (btv->c.type == BTTV_BOARD_ENLTV_FM_2)
                 ir_enltv_handle_key(btv);
@@ -147,11 +144,109 @@ static void bttv_input_timer(unsigned long data)
         mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
-/* ---------------------------------------------------------------*/
+/*
+ * FIXME: Nebula digi uses the legacy way to decode RC5, instead of relying
+ * on the rc-core way. As we need to be sure that both IRQ transitions are
+ * properly triggered, Better to touch it only with this hardware for
+ * testing.
+ */
+
+#define RC5_START(x)    (((x) >> 12) & 3)
+#define RC5_TOGGLE(x)   (((x) >> 11) & 1)
+#define RC5_ADDR(x)     (((x) >> 6) & 31)
+#define RC5_INSTR(x)    ((x) & 63)
+
+/* decode raw bit pattern to RC5 code */
+static u32 bttv_rc5_decode(unsigned int code)
+{
+        unsigned int org_code = code;
+        unsigned int pair;
+        unsigned int rc5 = 0;
+        int i;
+
+        for (i = 0; i < 14; ++i) {
+                pair = code & 0x3;
+                code >>= 2;
+
+                rc5 <<= 1;
+                switch (pair) {
+                case 0:
+                case 2:
+                        break;
+                case 1:
+                        rc5 |= 1;
+                break;
+                case 3:
+                        dprintk(KERN_INFO DEVNAME ":rc5_decode(%x) bad code\n",
+                                org_code);
+                        return 0;
+                }
+        }
+        dprintk(KERN_INFO DEVNAME ":"
+                "code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
+                "instr=%x\n", rc5, org_code, RC5_START(rc5),
+                RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
+        return rc5;
+}
+
+static void bttv_rc5_timer_end(unsigned long data)
+{
+        struct bttv_ir *ir = (struct bttv_ir *)data;
+        struct timeval tv;
+        unsigned long current_jiffies;
+        u32 gap;
+        u32 rc5 = 0;
+
+        /* get time */
+        current_jiffies = jiffies;
+        do_gettimeofday(&tv);
+
+        /* avoid overflow with gap >1s */
+        if (tv.tv_sec - ir->base_time.tv_sec > 1) {
+                gap = 200000;
+        } else {
+                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                    tv.tv_usec - ir->base_time.tv_usec;
+        }
+
+        /* signal we're ready to start a new code */
+        ir->active = false;
+
+        /* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */
+        if (gap < 28000) {
+                dprintk(KERN_INFO DEVNAME ": spurious timer_end\n");
+                return;
+        }
+
+        if (ir->last_bit < 20) {
+                /* ignore spurious codes (caused by light/other remotes) */
+                dprintk(KERN_INFO DEVNAME ": short code: %x\n", ir->code);
+        } else {
+                ir->code = (ir->code << ir->shift_by) | 1;
+                rc5 = bttv_rc5_decode(ir->code);
+
+                /* two start bits? */
+                if (RC5_START(rc5) != ir->start) {
+                        printk(KERN_INFO DEVNAME ":"
+                               " rc5 start bits invalid: %u\n", RC5_START(rc5));
+
+                        /* right address? */
+                } else if (RC5_ADDR(rc5) == ir->addr) {
+                        u32 toggle = RC5_TOGGLE(rc5);
+                        u32 instr = RC5_INSTR(rc5);
+
+                        /* Good code */
+                        rc_keydown(ir->dev, instr, toggle);
+                        dprintk(KERN_INFO DEVNAME ":"
+                                " instruction %x, toggle %x\n",
+                                instr, toggle);
+                }
+        }
+}
 
 static int bttv_rc5_irq(struct bttv *btv)
 {
-        struct card_ir *ir = btv->remote;
+        struct bttv_ir *ir = btv->remote;
         struct timeval tv;
         u32 gpio;
         u32 gap;
@@ -160,10 +255,6 @@ static int bttv_rc5_irq(struct bttv *btv)
         /* read gpio port */
         gpio = bttv_gpio_read(&btv->c);
 
-        /* remote IRQ? */
-        if (!(gpio & 0x20))
-                return 0;
-
         /* get time of bit */
         current_jiffies = jiffies;
         do_gettimeofday(&tv);
@@ -176,6 +267,13 @@ static int bttv_rc5_irq(struct bttv *btv)
                     tv.tv_usec - ir->base_time.tv_usec;
         }
 
+        dprintk(KERN_INFO DEVNAME ": RC5 IRQ: gap %d us for %s\n",
+                gap, (gpio & 0x20) ? "mark" : "space");
+
+        /* remote IRQ? */
+        if (!(gpio & 0x20))
+                return 0;
+
         /* active code => add bit */
         if (ir->active) {
                 /* only if in the code (otherwise spurious IRQ or timer
@@ -187,13 +285,12 @@ static int bttv_rc5_irq(struct bttv *btv)
                 }
                 /* starting new code */
         } else {
-                ir->active = 1;
+                ir->active = true;
                 ir->code = 0;
                 ir->base_time = tv;
                 ir->last_bit = 0;
 
-                mod_timer(&ir->timer_end,
-                          current_jiffies + msecs_to_jiffies(30));
+                mod_timer(&ir->timer, current_jiffies + msecs_to_jiffies(30));
         }
 
         /* toggle GPIO pin 4 to reset the irq */
@@ -204,7 +301,7 @@ static int bttv_rc5_irq(struct bttv *btv)
 
 /* ---------------------------------------------------------------------- */
 
-static void bttv_ir_start(struct bttv *btv, struct card_ir *ir)
+static void bttv_ir_start(struct bttv *btv, struct bttv_ir *ir)
 {
         if (ir->polling) {
                 setup_timer(&ir->timer, bttv_input_timer, (unsigned long)btv);
@@ -212,17 +309,10 @@ static void bttv_ir_start(struct bttv *btv, struct card_ir *ir)
                 add_timer(&ir->timer);
         } else if (ir->rc5_gpio) {
                 /* set timer_end for code completion */
-                init_timer(&ir->timer_end);
-                ir->timer_end.function = ir_rc5_timer_end;
-                ir->timer_end.data = (unsigned long)ir;
-
-                init_timer(&ir->timer_keyup);
-                ir->timer_keyup.function = ir_rc5_timer_keyup;
-                ir->timer_keyup.data = (unsigned long)ir;
+                setup_timer(&ir->timer, bttv_rc5_timer_end, (unsigned long)ir);
                 ir->shift_by = 1;
                 ir->start = 3;
                 ir->addr = 0x0;
-                ir->rc5_key_timeout = ir_rc5_key_timeout;
                 ir->rc5_remote_gap = ir_rc5_remote_gap;
         }
 }
@@ -237,7 +327,7 @@ static void bttv_ir_stop(struct bttv *btv)
         if (btv->remote->rc5_gpio) {
                 u32 gpio;
 
-                del_timer_sync(&btv->remote->timer_end);
+                del_timer_sync(&btv->remote->timer);
                 flush_scheduled_work();
 
                 gpio = bttv_gpio_read(&btv->c);
@@ -264,6 +354,18 @@ static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
                 return 0;
         dprintk(KERN_INFO DEVNAME ": key %02x\n", b);
 
+        /*
+         * NOTE:
+         * lirc_i2c maps the pv951 code as:
+         *      addr = 0x61D6
+         *      cmd = bit_reverse (b)
+         * So, it seems that this device uses NEC extended
+         * I decided to not fix the table, due to two reasons:
+         *      1) Without the actual device, this is only a guess;
+         *      2) As the addr is not reported via I2C, nor can be changed,
+         *         the device is bound to the vendor-provided RC.
+         */
+
         *ir_key = b;
         *ir_raw = b;
         return 1;
@@ -290,16 +392,15 @@ void __devinit init_bttv_i2c_ir(struct bttv *btv)
                 btv->init_data.name = "PV951";
                 btv->init_data.get_key = get_key_pv951;
                 btv->init_data.ir_codes = RC_MAP_PV951;
-                btv->init_data.type = IR_TYPE_OTHER;
                 info.addr = 0x4b;
                 break;
         default:
                 /*
                  * The external IR receiver is at i2c address 0x34 (0x35 for
-                 * reads).  Future Hauppauge cards will have an internal
-                 * receiver at 0x30 (0x31 for reads).  In theory, both can be
-                 * fitted, and Hauppauge suggest an external overrides an
-                 * internal.
+                 * reads).  Future Hauppauge cards will have an internal
+                 * receiver at 0x30 (0x31 for reads).  In theory, both can be
+                 * fitted, and Hauppauge suggest an external overrides an
+                 * internal.
                  * That's why we probe 0x1a (~0x34) first. CB
                  */
 
@@ -324,18 +425,17 @@ int __devexit fini_bttv_i2c(struct bttv *btv)
 
 int bttv_input_init(struct bttv *btv)
 {
-        struct card_ir *ir;
+        struct bttv_ir *ir;
         char *ir_codes = NULL;
-        struct input_dev *input_dev;
-        u64 ir_type = IR_TYPE_OTHER;
+        struct rc_dev *rc;
         int err = -ENOMEM;
 
         if (!btv->has_remote)
                 return -ENODEV;
 
         ir = kzalloc(sizeof(*ir),GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!ir || !input_dev)
+        rc = rc_allocate_device();
+        if (!ir || !rc)
                 goto err_out_free;
 
         /* detect & configure */
@@ -398,8 +498,7 @@ int bttv_input_init(struct bttv *btv)
                 break;
         case BTTV_BOARD_NEBULA_DIGITV:
                 ir_codes = RC_MAP_NEBULA;
-                btv->custom_irq = bttv_rc5_irq;
-                ir->rc5_gpio = 1;
+                ir->rc5_gpio = true;
                 break;
         case BTTV_BOARD_MACHTV_MAGICTV:
                 ir_codes         = RC_MAP_APAC_VIEWCOMP;
@@ -441,48 +540,43 @@ int bttv_input_init(struct bttv *btv)
         }
 
         /* init input device */
-        ir->dev = input_dev;
+        ir->dev = rc;
 
         snprintf(ir->name, sizeof(ir->name), "bttv IR (card=%d)",
                  btv->c.type);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(btv->c.pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type);
-        if (err < 0)
-                goto err_out_free;
-
-        input_dev->name = ir->name;
-        input_dev->phys = ir->phys;
-        input_dev->id.bustype = BUS_PCI;
-        input_dev->id.version = 1;
+        rc->input_name = ir->name;
+        rc->input_phys = ir->phys;
+        rc->input_id.bustype = BUS_PCI;
+        rc->input_id.version = 1;
         if (btv->c.pci->subsystem_vendor) {
-                input_dev->id.vendor  = btv->c.pci->subsystem_vendor;
-                input_dev->id.product = btv->c.pci->subsystem_device;
+                rc->input_id.vendor  = btv->c.pci->subsystem_vendor;
+                rc->input_id.product = btv->c.pci->subsystem_device;
         } else {
-                input_dev->id.vendor  = btv->c.pci->vendor;
-                input_dev->id.product = btv->c.pci->device;
+                rc->input_id.vendor  = btv->c.pci->vendor;
+                rc->input_id.product = btv->c.pci->device;
         }
-        input_dev->dev.parent = &btv->c.pci->dev;
+        rc->dev.parent = &btv->c.pci->dev;
+        rc->map_name = ir_codes;
+        rc->driver_name = MODULE_NAME;
 
         btv->remote = ir;
         bttv_ir_start(btv, ir);
 
         /* all done */
-        err = ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);
+        err = rc_register_device(rc);
         if (err)
                 goto err_out_stop;
 
-        /* the remote isn't as bouncy as a keyboard */
-        ir->dev->rep[REP_DELAY] = repeat_delay;
-        ir->dev->rep[REP_PERIOD] = repeat_period;
-
         return 0;
 
  err_out_stop:
         bttv_ir_stop(btv);
         btv->remote = NULL;
  err_out_free:
+        rc_free_device(rc);
         kfree(ir);
         return err;
 }
@@ -493,7 +587,7 @@ void bttv_input_fini(struct bttv *btv)
                 return;
 
         bttv_ir_stop(btv);
-        ir_input_unregister(btv->remote->dev);
+        rc_unregister_device(btv->remote->dev);
         kfree(btv->remote);
         btv->remote = NULL;
 }
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index 6fd2a8ebda1e..fd62bf15d779 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -17,7 +17,6 @@
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <media/v4l2-device.h>
-#include <media/ir-common.h>
 #include <media/i2c-addr.h>
 #include <media/tuner.h>
 
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index d1e26a448ed2..9b776faf0741 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -41,7 +41,7 @@
 #include <linux/device.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/tveeprom.h>
-#include <media/ir-common.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 
 #include "bt848.h"
@@ -120,6 +120,33 @@ struct bttv_format {
         int  hshift,vshift;   /* for planar modes   */
 };
 
+struct bttv_ir {
+        struct rc_dev           *dev;
+        struct timer_list       timer;
+
+        char                    name[32];
+        char                    phys[32];
+
+        /* Usual gpio signalling */
+        u32                     mask_keycode;
+        u32                     mask_keydown;
+        u32                     mask_keyup;
+        u32                     polling;
+        u32                     last_gpio;
+        int                     shift_by;
+        int                     start; // What should RC5_START() be
+        int                     addr; // What RC5_ADDR() should be.
+        int                     rc5_remote_gap;
+
+        /* RC5 gpio */
+        bool                    rc5_gpio;   /* Is RC5 legacy GPIO enabled? */
+        u32                     last_bit;   /* last raw bit seen */
+        u32                     code;       /* raw code under construction */
+        struct timeval          base_time;  /* time of last seen code */
+        bool                    active;     /* building raw code */
+};
+
+
 /* ---------------------------------------------------------- */
 
 struct bttv_geometry {
@@ -305,7 +332,6 @@ struct bttv_pll_info {
 /* for gpio-connected remote control */
 struct bttv_input {
         struct input_dev      *dev;
-        struct ir_input_state ir;
         char                  name[32];
         char                  phys[32];
         u32                   mask_keycode;
@@ -338,12 +364,10 @@ struct bttv {
         struct bttv_pll_info pll;
         int triton1;
         int gpioirq;
-        int (*custom_irq)(struct bttv *btv);
 
         int use_i2c_hw;
 
         /* old gpio interface */
-        wait_queue_head_t gpioq;
         int shutdown;
 
         void (*volume_gpio)(struct bttv *btv, __u16 volume);
@@ -368,7 +392,7 @@ struct bttv {
 
         /* infrared remote */
         int has_remote;
-        struct card_ir *remote;
+        struct bttv_ir *remote;
 
         /* I2C remote data */
         struct IR_i2c_init_data    init_data;