Author: oxygene Date: Tue Feb 23 21:31:37 2010 New Revision: 5152 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5152
Log: Remove nonsensical wrapper for function in PS/2 keyboard API.
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Patrick Georgi patrick.georgi@coresystems.de
Modified: trunk/src/include/pc80/keyboard.h trunk/src/mainboard/emulation/qemu-x86/mainboard.c trunk/src/northbridge/via/cx700/cx700_lpc.c trunk/src/northbridge/via/vx800/vx800_lpc.c trunk/src/pc80/keyboard.c trunk/src/southbridge/sis/sis966/sis966_lpc.c trunk/src/southbridge/via/vt8231/vt8231.c trunk/src/southbridge/via/vt8235/vt8235.c trunk/src/southbridge/via/vt8237r/vt8237r_lpc.c trunk/src/superio/ite/it8671f/superio.c trunk/src/superio/ite/it8673f/superio.c trunk/src/superio/ite/it8712f/superio.c trunk/src/superio/ite/it8716f/superio.c trunk/src/superio/ite/it8718f/superio.c trunk/src/superio/nsc/pc8374/superio.c trunk/src/superio/nsc/pc87309/superio.c trunk/src/superio/nsc/pc87351/superio.c trunk/src/superio/nsc/pc87360/superio.c trunk/src/superio/nsc/pc87366/superio.c trunk/src/superio/nsc/pc87417/superio.c trunk/src/superio/nsc/pc87427/superio.c trunk/src/superio/nsc/pc97307/superio.c trunk/src/superio/nsc/pc97317/superio.c trunk/src/superio/renesas/m3885x/superio.c trunk/src/superio/smsc/fdc37m60x/superio.c trunk/src/superio/smsc/lpc47b272/superio.c trunk/src/superio/smsc/lpc47b397/superio.c trunk/src/superio/smsc/lpc47m10x/superio.c trunk/src/superio/smsc/lpc47m15x/superio.c trunk/src/superio/smsc/lpc47n227/superio.c trunk/src/superio/smsc/smscsuperio/superio.c trunk/src/superio/winbond/w83627dhg/superio.c trunk/src/superio/winbond/w83627ehg/superio.c trunk/src/superio/winbond/w83627hf/superio.c trunk/src/superio/winbond/w83627thf/superio.c trunk/src/superio/winbond/w83627thg/superio.c trunk/src/superio/winbond/w83627uhg/superio.c trunk/src/superio/winbond/w83977f/superio.c trunk/src/superio/winbond/w83977tf/superio.c
Modified: trunk/src/include/pc80/keyboard.h ============================================================================== --- trunk/src/include/pc80/keyboard.h Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/include/pc80/keyboard.h Tue Feb 23 21:31:37 2010 (r5152) @@ -5,7 +5,7 @@ /* No initialization parameters for now */ };
-void init_pc_keyboard(unsigned port0, unsigned port1, struct pc_keyboard *kbd); +void pc_keyboard_init(struct pc_keyboard *keyboard); void set_kbc_ps2_mode(void);
#endif /* PC80_KEYBOARD_H */
Modified: trunk/src/mainboard/emulation/qemu-x86/mainboard.c ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/mainboard.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/mainboard/emulation/qemu-x86/mainboard.c Tue Feb 23 21:31:37 2010 (r5152) @@ -23,7 +23,7 @@ /* This sneaked in here, because Qemu does not * emulate a SuperIO chip */ - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0);
/* The PIRQ table is not working well for interrupt routing purposes. * so we'll just set the IRQ directly.
Modified: trunk/src/northbridge/via/cx700/cx700_lpc.c ============================================================================== --- trunk/src/northbridge/via/cx700/cx700_lpc.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/northbridge/via/cx700/cx700_lpc.c Tue Feb 23 21:31:37 2010 (r5152) @@ -294,7 +294,7 @@ isa_dma_init();
/* Initialize keyboard controller */ - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); }
static struct device_operations cx700_lpc_ops = {
Modified: trunk/src/northbridge/via/vx800/vx800_lpc.c ============================================================================== --- trunk/src/northbridge/via/vx800/vx800_lpc.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/northbridge/via/vx800/vx800_lpc.c Tue Feb 23 21:31:37 2010 (r5152) @@ -342,7 +342,7 @@ setup_i8259(); // make sure interupt controller is configured before keyboard init
/* turn on keyboard and RTC, no need to visit this reg twice */ - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); printk_debug ("ps2 usb lid, you set who can wakeup system from s3 sleep\n"); S3_ps2_kb_ms_wakeup(dev);
Modified: trunk/src/pc80/keyboard.c ============================================================================== --- trunk/src/pc80/keyboard.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/pc80/keyboard.c Tue Feb 23 21:31:37 2010 (r5152) @@ -159,7 +159,7 @@ return regval; }
-static void pc_keyboard_init(struct pc_keyboard *keyboard) +void pc_keyboard_init(struct pc_keyboard *keyboard) { u8 regval; printk_debug("Keyboard init...\n"); @@ -242,16 +242,6 @@ } }
- -void init_pc_keyboard(unsigned port0, unsigned port1, struct pc_keyboard *kbd) -{ - if ((port0 == 0x60) && (port1 == 0x64)) { - pc_keyboard_init(kbd); - } else { - printk_warning("Unsupported keyboard controller.\n"); - } -} - /* * Support PS/2 mode - oddball SIOs(KBC) need this setup * Not well documented. Google - 0xcb keyboard controller
Modified: trunk/src/southbridge/sis/sis966/sis966_lpc.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_lpc.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/southbridge/sis/sis966/sis966_lpc.c Tue Feb 23 21:31:37 2010 (r5152) @@ -93,7 +93,7 @@ int nmi_option;
printk_debug("LPC_INIT -------->\n"); - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0);
lpc_usb_legacy_init(dev); lpc_common_init(dev);
Modified: trunk/src/southbridge/via/vt8231/vt8231.c ============================================================================== --- trunk/src/southbridge/via/vt8231/vt8231.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/southbridge/via/vt8231/vt8231.c Tue Feb 23 21:31:37 2010 (r5152) @@ -26,7 +26,7 @@ regval |= 0x0f; pci_write_config8(lpc_dev, 0x51, regval); } - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); }
static void com_port_on(void)
Modified: trunk/src/southbridge/via/vt8235/vt8235.c ============================================================================== --- trunk/src/southbridge/via/vt8235/vt8235.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/southbridge/via/vt8235/vt8235.c Tue Feb 23 21:31:37 2010 (r5152) @@ -26,7 +26,7 @@ regval &= 0xfd; pci_write_config8(dev, 0x51, regval);
- init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); }
void dump_south(device_t dev0)
Modified: trunk/src/southbridge/via/vt8237r/vt8237r_lpc.c ============================================================================== --- trunk/src/southbridge/via/vt8237r/vt8237r_lpc.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/southbridge/via/vt8237r/vt8237r_lpc.c Tue Feb 23 21:31:37 2010 (r5152) @@ -522,7 +522,7 @@ { u8 regval = pci_read_config8(dev, 0x51); if (regval & 0x1) - init_pc_keyboard(0x60, 0x64, 0); + pc_keyboard_init(0); }
static void southbridge_init_common(struct device *dev)
Modified: trunk/src/superio/ite/it8671f/superio.c ============================================================================== --- trunk/src/superio/ite/it8671f/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/ite/it8671f/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -53,7 +53,7 @@ case IT8671F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8671F_KBCM: /* TODO. */ break;
Modified: trunk/src/superio/ite/it8673f/superio.c ============================================================================== --- trunk/src/superio/ite/it8673f/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/ite/it8673f/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -55,7 +55,7 @@ case IT8673F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8673F_KBCM: /* TODO. */ break;
Modified: trunk/src/superio/ite/it8712f/superio.c ============================================================================== --- trunk/src/superio/ite/it8712f/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/ite/it8712f/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -78,7 +78,7 @@ res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); set_kbc_ps2_mode(); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8712F_KBCM: /* TODO. */ break;
Modified: trunk/src/superio/ite/it8716f/superio.c ============================================================================== --- trunk/src/superio/ite/it8716f/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/ite/it8716f/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -112,7 +112,7 @@ case IT8716F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/ite/it8718f/superio.c ============================================================================== --- trunk/src/superio/ite/it8718f/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/ite/it8718f/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -55,7 +55,7 @@ case IT8718F_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case IT8718F_KBCM: /* TODO. */ break;
Modified: trunk/src/superio/nsc/pc8374/superio.c ============================================================================== --- trunk/src/superio/nsc/pc8374/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc8374/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -54,7 +54,7 @@ case PC8374_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc87309/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87309/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc87309/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -48,7 +48,7 @@ case PC87309_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc87351/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87351/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc87351/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -60,7 +60,7 @@ case PC87351_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc87360/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87360/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc87360/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -54,7 +54,7 @@ case PC87360_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc87366/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87366/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc87366/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -54,7 +54,7 @@ case PC87366_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc87417/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87417/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc87417/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -55,7 +55,7 @@ case PC87417_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc87427/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87427/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc87427/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -52,7 +52,7 @@ case PC87427_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/nsc/pc97307/superio.c ============================================================================== --- trunk/src/superio/nsc/pc97307/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc97307/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -55,7 +55,7 @@
res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break;
case PC97307_FDC:
Modified: trunk/src/superio/nsc/pc97317/superio.c ============================================================================== --- trunk/src/superio/nsc/pc97317/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/nsc/pc97317/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -55,7 +55,7 @@
res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break;
#if 0
Modified: trunk/src/superio/renesas/m3885x/superio.c ============================================================================== --- trunk/src/superio/renesas/m3885x/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/renesas/m3885x/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -41,7 +41,7 @@
printk_debug("Renesas M3885x: Initializing keyboard.\n"); set_kbc_ps2_mode(); - init_pc_keyboard(0x60, 0x64, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); m3885_configure_multikey(); }
Modified: trunk/src/superio/smsc/fdc37m60x/superio.c ============================================================================== --- trunk/src/superio/smsc/fdc37m60x/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/fdc37m60x/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -53,7 +53,7 @@ case FDC37M60X_KBCK: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case FDC37M60X_AUX: /* TODO. */ break;
Modified: trunk/src/superio/smsc/lpc47b272/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47b272/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/lpc47b272/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -152,7 +152,7 @@ case LPC47B272_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/smsc/lpc47b397/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47b397/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/lpc47b397/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -84,7 +84,7 @@ case LPC47B397_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/smsc/lpc47m10x/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47m10x/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/lpc47m10x/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -150,7 +150,7 @@ case LPC47M10X2_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/smsc/lpc47m15x/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47m15x/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/lpc47m15x/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -119,7 +119,7 @@ case LPC47M15X_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(0x60, 0x64, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/smsc/lpc47n227/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47n227/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/lpc47n227/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -164,7 +164,7 @@
case LPC47N227_KBDC: printk_debug("LPC47N227: Initializing keyboard.\n"); - init_pc_keyboard(0x60, 0x64, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/smsc/smscsuperio/superio.c ============================================================================== --- trunk/src/superio/smsc/smscsuperio/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/smsc/smscsuperio/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -232,7 +232,7 @@ } else if (ld == logical_device_table[i].devs[LD_KBC]) { res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); } }
Modified: trunk/src/superio/winbond/w83627dhg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627dhg/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83627dhg/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -59,7 +59,7 @@ case W83627DHG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/winbond/w83627ehg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627ehg/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83627ehg/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -125,7 +125,7 @@ case W83627EHG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case W83627EHG_HWM: res0 = find_resource(dev, PNP_IDX_IO0);
Modified: trunk/src/superio/winbond/w83627hf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627hf/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83627hf/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -133,7 +133,7 @@ case W83627HF_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; case W83627HF_HWM: res0 = find_resource(dev, PNP_IDX_IO0);
Modified: trunk/src/superio/winbond/w83627thf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627thf/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83627thf/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -66,7 +66,7 @@ case W83627THF_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/winbond/w83627thg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627thg/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83627thg/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -64,7 +64,7 @@ case W83627THG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/winbond/w83627uhg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627uhg/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83627uhg/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -113,7 +113,7 @@ case W83627UHG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/winbond/w83977f/superio.c ============================================================================== --- trunk/src/superio/winbond/w83977f/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83977f/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -61,7 +61,7 @@ case W83977F_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }
Modified: trunk/src/superio/winbond/w83977tf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83977tf/superio.c Tue Feb 23 20:38:44 2010 (r5151) +++ trunk/src/superio/winbond/w83977tf/superio.c Tue Feb 23 21:31:37 2010 (r5152) @@ -72,7 +72,7 @@ case W83977TF_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - init_pc_keyboard(res0->base, res1->base, &conf->keyboard); + pc_keyboard_init(&conf->keyboard); break; } }