diff options
Diffstat (limited to 'src/superio')
| -rw-r--r-- | src/superio/NSC/pc87360/chip.h | 3 | ||||
| -rw-r--r-- | src/superio/NSC/pc87360/superio.c | 15 | ||||
| -rw-r--r-- | src/superio/NSC/pc87366/superio.c | 1 | ||||
| -rw-r--r-- | src/superio/NSC/pc97307/superio.c | 1 | ||||
| -rw-r--r-- | src/superio/via/vt1211/vt1211.c | 1 | ||||
| -rw-r--r-- | src/superio/winbond/w83627hf/superio.c | 1 | ||||
| -rw-r--r-- | src/superio/winbond/w83627thf/superio.c | 1 |
7 files changed, 9 insertions, 14 deletions
diff --git a/src/superio/NSC/pc87360/chip.h b/src/superio/NSC/pc87360/chip.h index 9e0ef6f976..0a9846b137 100644 --- a/src/superio/NSC/pc87360/chip.h +++ b/src/superio/NSC/pc87360/chip.h @@ -5,7 +5,8 @@ #define SIO_COM2_BASE 0x2F8 #endif -extern struct chip_control superio_NSC_pc87360_control; +struct chip_operations; +extern struct chip_operations superio_NSC_pc87360_ops; #include <pc80/keyboard.h> #include <uart8250.h> diff --git a/src/superio/NSC/pc87360/superio.c b/src/superio/NSC/pc87360/superio.c index c2c33765eb..69eeb31e09 100644 --- a/src/superio/NSC/pc87360/superio.c +++ b/src/superio/NSC/pc87360/superio.c @@ -5,7 +5,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> @@ -24,7 +23,7 @@ static void init(device_t dev) if (!dev->enabled) { return; } - conf = dev->chip->chip_info; + conf = dev->chip_info; switch(dev->path.u.pnp.device) { case PC87360_SP1: res0 = find_resource(dev, PNP_IDX_IO0); @@ -65,13 +64,13 @@ static struct pnp_info pnp_dev_info[] = { }; -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_NSC_pc87360_control = { - .enumerate = enumerate, - .name = "NSC 87360" +struct chip_operations superio_NSC_pc87360_ops = { + .name = "NSC 87360", + .enable_dev = enable_dev, }; diff --git a/src/superio/NSC/pc87366/superio.c b/src/superio/NSC/pc87366/superio.c index 7c492583f3..0d1f878ec8 100644 --- a/src/superio/NSC/pc87366/superio.c +++ b/src/superio/NSC/pc87366/superio.c @@ -5,7 +5,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> diff --git a/src/superio/NSC/pc97307/superio.c b/src/superio/NSC/pc97307/superio.c index 124dd5c89c..2fb62e1c93 100644 --- a/src/superio/NSC/pc97307/superio.c +++ b/src/superio/NSC/pc97307/superio.c @@ -2,7 +2,6 @@ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ #include <arch/io.h> -#include <device/chip.h> #include <console/console.h> #include "chip.h" diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c index 26d9356a61..923a098317 100644 --- a/src/superio/via/vt1211/vt1211.c +++ b/src/superio/via/vt1211/vt1211.c @@ -26,7 +26,6 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <console/console.h> #include "vt1211.h" #include "chip.h" diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index ee0a6872e3..c70c4ea8ba 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -7,7 +7,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c index 1d057137fb..db0b308ec1 100644 --- a/src/superio/winbond/w83627thf/superio.c +++ b/src/superio/winbond/w83627thf/superio.c @@ -7,7 +7,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> |