diff options
| author | Yinghai Lu <yinghailu@gmail.com> | 2004-10-20 05:07:16 +0000 |
|---|---|---|
| committer | Yinghai Lu <yinghailu@gmail.com> | 2004-10-20 05:07:16 +0000 |
| commit | 6a61d6a4ae26d02844bf8043525d89b0ef9e0351 (patch) | |
| tree | ffe2c7e2680ccb73502fe4129b9727051792dadb /src/superio/winbond | |
| parent | abed01d81d0c55848232a9ebd9bb4c55d036f45d (diff) | |
| download | coreboot-6a61d6a4ae26d02844bf8043525d89b0ef9e0351.tar.xz | |
Tyan update to work with new CPU Config
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1693 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/superio/winbond')
| -rw-r--r-- | src/superio/winbond/w83627hf/chip.h | 2 | ||||
| -rw-r--r-- | src/superio/winbond/w83627hf/superio.c | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h index 849e6e707f..50a95a8880 100644 --- a/src/superio/winbond/w83627hf/chip.h +++ b/src/superio/winbond/w83627hf/chip.h @@ -5,7 +5,7 @@ #define SIO_COM2_BASE 0x2F8 #endif -extern struct chip_control superio_winbond_w83627hf_control; +extern struct chip_operations superio_winbond_w83627hf_ops; #include <pc80/keyboard.h> #include <uart8250.h> diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index c70c4ea8ba..1fd1eb0bed 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -112,23 +112,23 @@ static void w83627hf_init(device_t dev) if (!dev->enabled) { return; } - conf = dev->chip->chip_info; + conf = dev->chip_info; switch(dev->path.u.pnp.device) { case W83627HF_SP1: - res0 = get_resource(dev, PNP_IDX_IO0); + res0 = find_resource(dev, PNP_IDX_IO0); init_uart8250(res0->base, &conf->com1); break; case W83627HF_SP2: - res0 = get_resource(dev, PNP_IDX_IO0); + res0 = find_resource(dev, PNP_IDX_IO0); init_uart8250(res0->base, &conf->com2); break; case W83627HF_KBC: - res0 = get_resource(dev, PNP_IDX_IO0); - res1 = get_resource(dev, PNP_IDX_IO1); + res0 = find_resource(dev, PNP_IDX_IO0); + res1 = find_resource(dev, PNP_IDX_IO1); init_pc_keyboard(res0->base, res1->base, &conf->keyboard); break; case W83627HF_HWM: - res0 = get_resource(dev, PNP_IDX_IO0); + res0 = find_resource(dev, PNP_IDX_IO0); init_hwm(res0->base); break; } @@ -208,14 +208,14 @@ static struct pnp_info pnp_dev_info[] = { { &ops, W83627HF_HWM, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 } }, }; -static void enumerate(struct chip *chip) +static void enable_dev(struct device *dev) { - pnp_enumerate(chip, sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), - &pnp_ops, pnp_dev_info); + pnp_enable_devices(dev, &pnp_ops, + sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); } -struct chip_control superio_winbond_w83627hf_control = { - .enumerate = enumerate, - .name = "Winbond w83627hf" +struct chip_operations superio_winbond_w83627hf_ops = { + .name = "Winbond w83627hf", + .enable_dev = enable_dev, }; |