[PATCH] v4l: CX88 Update
[linux-2.6.git] / drivers / media / video / cx88 / cx88-input.c
index bdc26e7..2148877 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-input.c,v 1.13 2005/06/13 16:07:46 nsh Exp $
+ * $Id: cx88-input.c,v 1.15 2005/07/07 13:58:38 mchehab Exp $
  *
  * Device driver for GPIO attached remote control interfaces
  * on Conexant 2388x based TV/DVB cards.
 
 /* DigitalNow DNTV Live DVB-T Remote */
 static IR_KEYTAB_TYPE ir_codes_dntv_live_dvb_t[IR_KEYTAB_SIZE] = {
-       [ 0x00 ] = KEY_ESC,         // 'go up a level?'
-       [ 0x01 ] = KEY_KP1,         // '1'
-       [ 0x02 ] = KEY_KP2,         // '2'
-       [ 0x03 ] = KEY_KP3,         // '3'
-       [ 0x04 ] = KEY_KP4,         // '4'
-       [ 0x05 ] = KEY_KP5,         // '5'
-       [ 0x06 ] = KEY_KP6,         // '6'
-       [ 0x07 ] = KEY_KP7,         // '7'
-       [ 0x08 ] = KEY_KP8,         // '8'
-       [ 0x09 ] = KEY_KP9,         // '9'
-       [ 0x0a ] = KEY_KP0,         // '0'
-       [ 0x0b ] = KEY_TUNER,       // 'tv/fm'
-       [ 0x0c ] = KEY_SEARCH,      // 'scan'
-       [ 0x0d ] = KEY_STOP,        // 'stop'
-       [ 0x0e ] = KEY_PAUSE,       // 'pause'
-       [ 0x0f ] = KEY_LIST,        // 'source'
-
-       [ 0x10 ] = KEY_MUTE,        // 'mute'
-       [ 0x11 ] = KEY_REWIND,      // 'backward <<'
-       [ 0x12 ] = KEY_POWER,       // 'power'
-       [ 0x13 ] = KEY_S,           // 'snap'
-       [ 0x14 ] = KEY_AUDIO,       // 'stereo'
-       [ 0x15 ] = KEY_CLEAR,       // 'reset'
-       [ 0x16 ] = KEY_PLAY,        // 'play'
-       [ 0x17 ] = KEY_ENTER,       // 'enter'
-       [ 0x18 ] = KEY_ZOOM,        // 'full screen'
-       [ 0x19 ] = KEY_FASTFORWARD, // 'forward >>'
-       [ 0x1a ] = KEY_CHANNELUP,   // 'channel +'
-       [ 0x1b ] = KEY_VOLUMEUP,    // 'volume +'
-       [ 0x1c ] = KEY_INFO,        // 'preview'
-       [ 0x1d ] = KEY_RECORD,      // 'record'
-       [ 0x1e ] = KEY_CHANNELDOWN, // 'channel -'
-       [ 0x1f ] = KEY_VOLUMEDOWN,  // 'volume -'
+       [0x00] = KEY_ESC,               /* 'go up a level?' */
+       /* Keys 0 to 9 */
+       [0x0a] = KEY_KP0,
+       [0x01] = KEY_KP1,
+       [0x02] = KEY_KP2,
+       [0x03] = KEY_KP3,
+       [0x04] = KEY_KP4,
+       [0x05] = KEY_KP5,
+       [0x06] = KEY_KP6,
+       [0x07] = KEY_KP7,
+       [0x08] = KEY_KP8,
+       [0x09] = KEY_KP9,
+
+       [0x0b] = KEY_TUNER,             /* tv/fm */
+       [0x0c] = KEY_SEARCH,            /* scan */
+       [0x0d] = KEY_STOP,
+       [0x0e] = KEY_PAUSE,
+       [0x0f] = KEY_LIST,              /* source */
+
+       [0x10] = KEY_MUTE,
+       [0x11] = KEY_REWIND,            /* backward << */
+       [0x12] = KEY_POWER,
+       [0x13] = KEY_S,                 /* snap */
+       [0x14] = KEY_AUDIO,             /* stereo */
+       [0x15] = KEY_CLEAR,             /* reset */
+       [0x16] = KEY_PLAY,
+       [0x17] = KEY_ENTER,
+       [0x18] = KEY_ZOOM,              /* full screen */
+       [0x19] = KEY_FASTFORWARD,       /* forward >> */
+       [0x1a] = KEY_CHANNELUP,
+       [0x1b] = KEY_VOLUMEUP,
+       [0x1c] = KEY_INFO,              /* preview */
+       [0x1d] = KEY_RECORD,            /* record */
+       [0x1e] = KEY_CHANNELDOWN,
+       [0x1f] = KEY_VOLUMEDOWN,
 };
 
 /* ---------------------------------------------------------------------- */
 
 /* IO-DATA BCTV7E Remote */
 static IR_KEYTAB_TYPE ir_codes_iodata_bctv7e[IR_KEYTAB_SIZE] = {
-       [ 0x40 ] = KEY_TV,              // TV
-       [ 0x20 ] = KEY_RADIO,           // FM
-       [ 0x60 ] = KEY_EPG,             // EPG
-       [ 0x00 ] = KEY_POWER,           // power
-
-       [ 0x50 ] = KEY_KP1,             // 1
-       [ 0x30 ] = KEY_KP2,             // 2
-       [ 0x70 ] = KEY_KP3,             // 3
-       [ 0x10 ] = KEY_L,               // Live
-
-       [ 0x48 ] = KEY_KP4,             // 4
-       [ 0x28 ] = KEY_KP5,             // 5
-       [ 0x68 ] = KEY_KP6,             // 6
-       [ 0x08 ] = KEY_T,               // Time Shift
-
-       [ 0x58 ] = KEY_KP7,             // 7
-       [ 0x38 ] = KEY_KP8,             // 8
-       [ 0x78 ] = KEY_KP9,             // 9
-       [ 0x18 ] = KEY_PLAYPAUSE,       // Play
-
-       [ 0x44 ] = KEY_KP0,             // 10
-       [ 0x24 ] = KEY_ENTER,           // 11
-       [ 0x64 ] = KEY_ESC,             // 12
-       [ 0x04 ] = KEY_M,               // Multi
-
-       [ 0x54 ] = KEY_VIDEO,           // VIDEO
-       [ 0x34 ] = KEY_CHANNELUP,       // channel +
-       [ 0x74 ] = KEY_VOLUMEUP,        // volume +
-       [ 0x14 ] = KEY_MUTE,            // Mute
-
-       [ 0x4c ] = KEY_S,               // SVIDEO
-       [ 0x2c ] = KEY_CHANNELDOWN,     // channel -
-       [ 0x6c ] = KEY_VOLUMEDOWN,      // volume -
-       [ 0x0c ] = KEY_ZOOM,            // Zoom
-
-       [ 0x5c ] = KEY_PAUSE,           // pause
-       [ 0x3c ] = KEY_C,               // || (red)
-       [ 0x7c ] = KEY_RECORD,          // recording
-       [ 0x1c ] = KEY_STOP,            // stop
-
-       [ 0x41 ] = KEY_REWIND,          // backward <<
-       [ 0x21 ] = KEY_PLAY,            // play
-       [ 0x61 ] = KEY_FASTFORWARD,     // forward >>
-       [ 0x01 ] = KEY_NEXT,            // skip >|
+       [0x40] = KEY_TV,
+       [0x20] = KEY_RADIO,             /* FM */
+       [0x60] = KEY_EPG,
+       [0x00] = KEY_POWER,
+
+       /* Keys 0 to 9 */
+       [0x44] = KEY_KP0,               /* 10 */
+       [0x50] = KEY_KP1,
+       [0x30] = KEY_KP2,
+       [0x70] = KEY_KP3,
+       [0x48] = KEY_KP4,
+       [0x28] = KEY_KP5,
+       [0x68] = KEY_KP6,
+       [0x58] = KEY_KP7,
+       [0x38] = KEY_KP8,
+       [0x78] = KEY_KP9,
+
+       [0x10] = KEY_L,                 /* Live */
+       [0x08] = KEY_T,                 /* Time Shift */
+
+       [0x18] = KEY_PLAYPAUSE,         /* Play */
+
+       [0x24] = KEY_ENTER,             /* 11 */
+       [0x64] = KEY_ESC,               /* 12 */
+       [0x04] = KEY_M,                 /* Multi */
+
+       [0x54] = KEY_VIDEO,
+       [0x34] = KEY_CHANNELUP,
+       [0x74] = KEY_VOLUMEUP,
+       [0x14] = KEY_MUTE,
+
+       [0x4c] = KEY_S,                 /* SVIDEO */
+       [0x2c] = KEY_CHANNELDOWN,
+       [0x6c] = KEY_VOLUMEDOWN,
+       [0x0c] = KEY_ZOOM,
+
+       [0x5c] = KEY_PAUSE,
+       [0x3c] = KEY_C,                 /* || (red) */
+       [0x7c] = KEY_RECORD,            /* recording */
+       [0x1c] = KEY_STOP,
+
+       [0x41] = KEY_REWIND,            /* backward << */
+       [0x21] = KEY_PLAY,
+       [0x61] = KEY_FASTFORWARD,       /* forward >> */
+       [0x01] = KEY_NEXT,              /* skip >| */
 };
 
 /* ---------------------------------------------------------------------- */
 
 /* ADS Tech Instant TV DVB-T PCI Remote */
 static IR_KEYTAB_TYPE ir_codes_adstech_dvb_t_pci[IR_KEYTAB_SIZE] = {
-       [ 0x5b ] = KEY_POWER,
-       [ 0x5f ] = KEY_MUTE,
-       [ 0x57 ] = KEY_1,
-       [ 0x4f ] = KEY_2,
-       [ 0x53 ] = KEY_3,
-       [ 0x56 ] = KEY_4,
-       [ 0x4e ] = KEY_5,
-       [ 0x5e ] = KEY_6,
-       [ 0x54 ] = KEY_7,
-       [ 0x4c ] = KEY_8,
-       [ 0x5c ] = KEY_9,
-       [ 0x4d ] = KEY_0,
-       [ 0x55 ] = KEY_GOTO,
-       [ 0x5d ] = KEY_SEARCH,
-       [ 0x17 ] = KEY_EPG,             // Guide
-       [ 0x1f ] = KEY_MENU,
-       [ 0x0f ] = KEY_UP,
-       [ 0x46 ] = KEY_DOWN,
-       [ 0x16 ] = KEY_LEFT,
-       [ 0x1e ] = KEY_RIGHT,
-       [ 0x0e ] = KEY_SELECT,          // Enter
-       [ 0x5a ] = KEY_INFO,
-       [ 0x52 ] = KEY_EXIT,
-       [ 0x59 ] = KEY_PREVIOUS,
-       [ 0x51 ] = KEY_NEXT,
-       [ 0x58 ] = KEY_REWIND,
-       [ 0x50 ] = KEY_FORWARD,
-       [ 0x44 ] = KEY_PLAYPAUSE,
-       [ 0x07 ] = KEY_STOP,
-       [ 0x1b ] = KEY_RECORD,
-       [ 0x13 ] = KEY_TUNER,           // Live
-       [ 0x0a ] = KEY_A,
-       [ 0x12 ] = KEY_B,
-       [ 0x03 ] = KEY_PROG1,           // 1
-       [ 0x01 ] = KEY_PROG2,           // 2
-       [ 0x00 ] = KEY_PROG3,           // 3
-       [ 0x06 ] = KEY_DVD,
-       [ 0x48 ] = KEY_AUX,             // Photo
-       [ 0x40 ] = KEY_VIDEO,
-       [ 0x19 ] = KEY_AUDIO,           // Music
-       [ 0x0b ] = KEY_CHANNELUP,
-       [ 0x08 ] = KEY_CHANNELDOWN,
-       [ 0x15 ] = KEY_VOLUMEUP,
-       [ 0x1c ] = KEY_VOLUMEDOWN,
+       /* Keys 0 to 9 */
+       [0x4d] = KEY_0,
+       [0x57] = KEY_1,
+       [0x4f] = KEY_2,
+       [0x53] = KEY_3,
+       [0x56] = KEY_4,
+       [0x4e] = KEY_5,
+       [0x5e] = KEY_6,
+       [0x54] = KEY_7,
+       [0x4c] = KEY_8,
+       [0x5c] = KEY_9,
+
+       [0x5b] = KEY_POWER,
+       [0x5f] = KEY_MUTE,
+       [0x55] = KEY_GOTO,
+       [0x5d] = KEY_SEARCH,
+       [0x17] = KEY_EPG,               /* Guide */
+       [0x1f] = KEY_MENU,
+       [0x0f] = KEY_UP,
+       [0x46] = KEY_DOWN,
+       [0x16] = KEY_LEFT,
+       [0x1e] = KEY_RIGHT,
+       [0x0e] = KEY_SELECT,            /* Enter */
+       [0x5a] = KEY_INFO,
+       [0x52] = KEY_EXIT,
+       [0x59] = KEY_PREVIOUS,
+       [0x51] = KEY_NEXT,
+       [0x58] = KEY_REWIND,
+       [0x50] = KEY_FORWARD,
+       [0x44] = KEY_PLAYPAUSE,
+       [0x07] = KEY_STOP,
+       [0x1b] = KEY_RECORD,
+       [0x13] = KEY_TUNER,             /* Live */
+       [0x0a] = KEY_A,
+       [0x12] = KEY_B,
+       [0x03] = KEY_PROG1,             /* 1 */
+       [0x01] = KEY_PROG2,             /* 2 */
+       [0x00] = KEY_PROG3,             /* 3 */
+       [0x06] = KEY_DVD,
+       [0x48] = KEY_AUX,               /* Photo */
+       [0x40] = KEY_VIDEO,
+       [0x19] = KEY_AUDIO,             /* Music */
+       [0x0b] = KEY_CHANNELUP,
+       [0x08] = KEY_CHANNELDOWN,
+       [0x15] = KEY_VOLUMEUP,
+       [0x1c] = KEY_VOLUMEDOWN,
 };
 
 /* ---------------------------------------------------------------------- */
 
 /* MSI TV@nywhere remote */
 static IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = {
-       [ 0x00 ] = KEY_0,           /* '0' */
-       [ 0x01 ] = KEY_1,           /* '1' */
-       [ 0x02 ] = KEY_2,           /* '2' */
-       [ 0x03 ] = KEY_3,           /* '3' */
-       [ 0x04 ] = KEY_4,           /* '4' */
-       [ 0x05 ] = KEY_5,           /* '5' */
-       [ 0x06 ] = KEY_6,           /* '6' */
-       [ 0x07 ] = KEY_7,           /* '7' */
-       [ 0x08 ] = KEY_8,           /* '8' */
-       [ 0x09 ] = KEY_9,           /* '9' */
-       [ 0x0c ] = KEY_MUTE,        /* 'Mute' */
-       [ 0x0f ] = KEY_SCREEN,      /* 'Full Screen' */
-       [ 0x10 ] = KEY_F,           /* 'Funtion' */
-       [ 0x11 ] = KEY_T,           /* 'Time shift' */
-       [ 0x12 ] = KEY_POWER,       /* 'Power' */
-       [ 0x13 ] = KEY_MEDIA,       /* 'MTS' */
-       [ 0x14 ] = KEY_SLOW,        /* 'Slow' */
-       [ 0x16 ] = KEY_REWIND,      /* 'backward <<' */
-       [ 0x17 ] = KEY_ENTER,       /* 'Return' */
-       [ 0x18 ] = KEY_FASTFORWARD, /* 'forward >>' */
-       [ 0x1a ] = KEY_CHANNELUP,   /* 'Channel+' */
-       [ 0x1b ] = KEY_VOLUMEUP,    /* 'Volume+' */
-       [ 0x1e ] = KEY_CHANNELDOWN, /* 'Channel-' */
-       [ 0x1f ] = KEY_VOLUMEDOWN,  /* 'Volume-' */
+       /* Keys 0 to 9 */
+       [0x00] = KEY_0,
+       [0x01] = KEY_1,
+       [0x02] = KEY_2,
+       [0x03] = KEY_3,
+       [0x04] = KEY_4,
+       [0x05] = KEY_5,
+       [0x06] = KEY_6,
+       [0x07] = KEY_7,
+       [0x08] = KEY_8,
+       [0x09] = KEY_9,
+
+       [0x0c] = KEY_MUTE,
+       [0x0f] = KEY_SCREEN,            /* Full Screen */
+       [0x10] = KEY_F,                 /* Funtion */
+       [0x11] = KEY_T,                 /* Time shift */
+       [0x12] = KEY_POWER,
+       [0x13] = KEY_MEDIA,             /* MTS */
+       [0x14] = KEY_SLOW,
+       [0x16] = KEY_REWIND,            /* backward << */
+       [0x17] = KEY_ENTER,             /* Return */
+       [0x18] = KEY_FASTFORWARD,       /* forward >> */
+       [0x1a] = KEY_CHANNELUP,
+       [0x1b] = KEY_VOLUMEUP,
+       [0x1e] = KEY_CHANNELDOWN,
+       [0x1f] = KEY_VOLUMEDOWN,
 };
 
 /* ---------------------------------------------------------------------- */
 
 struct cx88_IR {
-       struct cx88_core        *core;
-       struct input_dev        input;
-       struct ir_input_state   ir;
-       char                    name[32];
-       char                    phys[32];
+       struct cx88_core *core;
+       struct input_dev input;
+       struct ir_input_state ir;
+       char name[32];
+       char phys[32];
 
        /* sample from gpio pin 16 */
-       int                     sampling;
-       u32                     samples[16];
-       int                     scount;
-       unsigned long           release;
+       int sampling;
+       u32 samples[16];
+       int scount;
+       unsigned long release;
 
        /* poll external decoder */
-       int                     polling;
-       struct work_struct      work;
-       struct timer_list       timer;
-       u32                     gpio_addr;
-       u32                     last_gpio;
-       u32                     mask_keycode;
-       u32                     mask_keydown;
-       u32                     mask_keyup;
+       int polling;
+       struct work_struct work;
+       struct timer_list timer;
+       u32 gpio_addr;
+       u32 last_gpio;
+       u32 mask_keycode;
+       u32 mask_keydown;
+       u32 mask_keyup;
 };
 
 static int ir_debug = 0;
-module_param(ir_debug, int, 0644);    /* debug level [IR] */
+module_param(ir_debug, int, 0644);     /* debug level [IR] */
 MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
 #define ir_dprintk(fmt, arg...)        if (ir_debug) \
@@ -254,37 +261,37 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
        /* extract data */
        data = ir_extract_bits(gpio, ir->mask_keycode);
        ir_dprintk("irq gpio=0x%x code=%d | %s%s%s\n",
-               gpio, data,
-               ir->polling               ? "poll"  : "irq",
-               (gpio & ir->mask_keydown) ? " down" : "",
-               (gpio & ir->mask_keyup)   ? " up"   : "");
+                  gpio, data,
+                  ir->polling ? "poll" : "irq",
+                  (gpio & ir->mask_keydown) ? " down" : "",
+                  (gpio & ir->mask_keyup) ? " up" : "");
 
        if (ir->mask_keydown) {
                /* bit set on keydown */
                if (gpio & ir->mask_keydown) {
-                       ir_input_keydown(&ir->input,&ir->ir,data,data);
+                       ir_input_keydown(&ir->input, &ir->ir, data, data);
                } else {
-                       ir_input_nokey(&ir->input,&ir->ir);
+                       ir_input_nokey(&ir->input, &ir->ir);
                }
 
        } else if (ir->mask_keyup) {
                /* bit cleared on keydown */
                if (0 == (gpio & ir->mask_keyup)) {
-                       ir_input_keydown(&ir->input,&ir->ir,data,data);
+                       ir_input_keydown(&ir->input, &ir->ir, data, data);
                } else {
-                       ir_input_nokey(&ir->input,&ir->ir);
+                       ir_input_nokey(&ir->input, &ir->ir);
                }
 
        } else {
                /* can't distinguish keydown/up :-/ */
-               ir_input_keydown(&ir->input,&ir->ir,data,data);
-               ir_input_nokey(&ir->input,&ir->ir);
+               ir_input_keydown(&ir->input, &ir->ir, data, data);
+               ir_input_nokey(&ir->input, &ir->ir);
        }
 }
 
 static void ir_timer(unsigned long data)
 {
-       struct cx88_IR *ir = (struct cx88_IR*)data;
+       struct cx88_IR *ir = (struct cx88_IR *)data;
 
        schedule_work(&ir->work);
 }
@@ -307,62 +314,62 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        IR_KEYTAB_TYPE *ir_codes = NULL;
        int ir_type = IR_TYPE_OTHER;
 
-       ir = kmalloc(sizeof(*ir),GFP_KERNEL);
+       ir = kmalloc(sizeof(*ir), GFP_KERNEL);
        if (NULL == ir)
                return -ENOMEM;
-       memset(ir,0,sizeof(*ir));
+       memset(ir, 0, sizeof(*ir));
 
        /* detect & configure */
        switch (core->board) {
        case CX88_BOARD_DNTV_LIVE_DVB_T:
        case CX88_BOARD_KWORLD_DVB_T:
-               ir_codes         = ir_codes_dntv_live_dvb_t;
-               ir->gpio_addr    = MO_GP1_IO;
+               ir_codes = ir_codes_dntv_live_dvb_t;
+               ir->gpio_addr = MO_GP1_IO;
                ir->mask_keycode = 0x1f;
-               ir->mask_keyup   = 0x60;
-               ir->polling      = 50; // ms
+               ir->mask_keyup = 0x60;
+               ir->polling = 50; /* ms */
                break;
        case CX88_BOARD_HAUPPAUGE:
        case CX88_BOARD_HAUPPAUGE_DVB_T1:
-               ir_codes         = ir_codes_hauppauge_new;
-               ir_type          = IR_TYPE_RC5;
-               ir->sampling     = 1;
+               ir_codes = ir_codes_hauppauge_new;
+               ir_type = IR_TYPE_RC5;
+               ir->sampling = 1;
                break;
        case CX88_BOARD_WINFAST2000XP_EXPERT:
-               ir_codes         = ir_codes_winfast;
-               ir->gpio_addr    = MO_GP0_IO;
+               ir_codes = ir_codes_winfast;
+               ir->gpio_addr = MO_GP0_IO;
                ir->mask_keycode = 0x8f8;
-               ir->mask_keyup   = 0x100;
-               ir->polling      = 1; // ms
+               ir->mask_keyup = 0x100;
+               ir->polling = 1; /* ms */
                break;
        case CX88_BOARD_IODATA_GVBCTV7E:
-               ir_codes         = ir_codes_iodata_bctv7e;
-               ir->gpio_addr    = MO_GP0_IO;
+               ir_codes = ir_codes_iodata_bctv7e;
+               ir->gpio_addr = MO_GP0_IO;
                ir->mask_keycode = 0xfd;
                ir->mask_keydown = 0x02;
-               ir->polling      = 5; // ms
+               ir->polling = 5; /* ms */
                break;
        case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO:
-               ir_codes         = ir_codes_pixelview;
-               ir->gpio_addr    = MO_GP1_IO;
+               ir_codes = ir_codes_pixelview;
+               ir->gpio_addr = MO_GP1_IO;
                ir->mask_keycode = 0x1f;
-               ir->mask_keyup   = 0x80;
-               ir->polling      = 1; // ms
+               ir->mask_keyup = 0x80;
+               ir->polling = 1; /* ms */
                break;
        case CX88_BOARD_ADSTECH_DVB_T_PCI:
-               ir_codes         = ir_codes_adstech_dvb_t_pci;
-               ir->gpio_addr    = MO_GP1_IO;
+               ir_codes = ir_codes_adstech_dvb_t_pci;
+               ir->gpio_addr = MO_GP1_IO;
                ir->mask_keycode = 0xbf;
-               ir->mask_keyup   = 0x40;
-               ir->polling      = 50; // ms
+               ir->mask_keyup = 0x40;
+               ir->polling = 50; /* ms */
+               break;
+       case CX88_BOARD_MSI_TVANYWHERE_MASTER:
+               ir_codes = ir_codes_msi_tvanywhere;
+               ir->gpio_addr = MO_GP1_IO;
+               ir->mask_keycode = 0x1f;
+               ir->mask_keyup = 0x40;
+               ir->polling = 1; /* ms */
                break;
-        case CX88_BOARD_MSI_TVANYWHERE_MASTER:
-                ir_codes         = ir_codes_msi_tvanywhere;
-                ir->gpio_addr    = MO_GP1_IO;
-                ir->mask_keycode = 0x1f;
-                ir->mask_keyup   = 0x40;
-                ir->polling      = 1;
-                break;
        }
 
        if (NULL == ir_codes) {
@@ -373,8 +380,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        /* init input device */
        snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)",
                 cx88_boards[core->board].name);
-       snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
-                pci_name(pci));
+       snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
        ir_input_init(&ir->input, &ir->ir, ir_type, ir_codes);
        ir->input.name = ir->name;
@@ -382,10 +388,10 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        ir->input.id.bustype = BUS_PCI;
        ir->input.id.version = 1;
        if (pci->subsystem_vendor) {
-               ir->input.id.vendor  = pci->subsystem_vendor;
+               ir->input.id.vendor = pci->subsystem_vendor;
                ir->input.id.product = pci->subsystem_device;
        } else {
-               ir->input.id.vendor  = pci->vendor;
+               ir->input.id.vendor = pci->vendor;
                ir->input.id.product = pci->device;
        }
 
@@ -397,13 +403,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                INIT_WORK(&ir->work, cx88_ir_work, ir);
                init_timer(&ir->timer);
                ir->timer.function = ir_timer;
-               ir->timer.data     = (unsigned long)ir;
+               ir->timer.data = (unsigned long)ir;
                schedule_work(&ir->work);
        }
        if (ir->sampling) {
-               core->pci_irqmask |= (1<<18);   // IR_SMP_INT
-               cx_write(MO_DDS_IO, 0xa80a80);  // 4 kHz sample rate
-               cx_write(MO_DDSCFG_IO,   0x5);  // enable
+               core->pci_irqmask |= (1 << 18); /* IR_SMP_INT */
+               cx_write(MO_DDS_IO, 0xa80a80);  /* 4 kHz sample rate */
+               cx_write(MO_DDSCFG_IO, 0x5);    /* enable */
        }
 
        /* all done */
@@ -439,7 +445,7 @@ int cx88_ir_fini(struct cx88_core *core)
 void cx88_ir_irq(struct cx88_core *core)
 {
        struct cx88_IR *ir = core->ir;
-       u32 samples,rc5;
+       u32 samples, rc5;
        int i;
 
        if (NULL == ir)
@@ -448,7 +454,7 @@ void cx88_ir_irq(struct cx88_core *core)
                return;
 
        samples = cx_read(MO_SAMPLE_IO);
-       if (0 != samples  &&  0xffffffff != samples) {
+       if (0 != samples && 0xffffffff != samples) {
                /* record sample data */
                if (ir->scount < ARRAY_SIZE(ir->samples))
                        ir->samples[ir->scount++] = samples;
@@ -456,8 +462,8 @@ void cx88_ir_irq(struct cx88_core *core)
        }
        if (!ir->scount) {
                /* nothing to sample */
-               if (ir->ir.keypressed && time_after(jiffies,ir->release))
-                       ir_input_nokey(&ir->input,&ir->ir);
+               if (ir->ir.keypressed && time_after(jiffies, ir->release))
+                       ir_input_nokey(&ir->input, &ir->ir);
                return;
        }
 
@@ -467,14 +473,14 @@ void cx88_ir_irq(struct cx88_core *core)
        for (i = 0; i < ir->scount; i++)
                ir->samples[i] = ~ir->samples[i];
        if (ir_debug)
-               ir_dump_samples(ir->samples,ir->scount);
+               ir_dump_samples(ir->samples, ir->scount);
 
        /* decode it */
        switch (core->board) {
        case CX88_BOARD_HAUPPAUGE:
        case CX88_BOARD_HAUPPAUGE_DVB_T1:
-               rc5 = ir_decode_biphase(ir->samples,ir->scount,5,7);
-               ir_dprintk("biphase decoded: %x\n",rc5);
+               rc5 = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
+               ir_dprintk("biphase decoded: %x\n", rc5);
                if ((rc5 & 0xfffff000) != 0x3000)
                        break;
                ir_input_keydown(&ir->input, &ir->ir, rc5 & 0x3f, rc5);