diff options
| author | kato <kato@FreeBSD.org> | 1999-06-24 12:13:08 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1999-06-24 12:13:08 +0000 |
| commit | 3e3cf46989dc0a23e9009be02179e18cbbd55b40 (patch) | |
| tree | a14ab65b486f952fdab9bbb093dd2d6119b18752 /sys/pc98/cbus/syscons_cbus.c | |
| parent | 2e2fe43a357a07fe5a62764e2d21d93dd709f407 (diff) | |
| download | FreeBSD-src-3e3cf46989dc0a23e9009be02179e18cbbd55b40.zip FreeBSD-src-3e3cf46989dc0a23e9009be02179e18cbbd55b40.tar.gz | |
Merge with sys/isa/syscons_isa.c and sys/dev/syscons/syscons.c
revisions 1.6 and 1.308, respectively.
Pointed-out by: yokota
Diffstat (limited to 'sys/pc98/cbus/syscons_cbus.c')
| -rw-r--r-- | sys/pc98/cbus/syscons_cbus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c index 5bca2d0..c30f702 100644 --- a/sys/pc98/cbus/syscons_cbus.c +++ b/sys/pc98/cbus/syscons_cbus.c @@ -1,5 +1,5 @@ /*- - * $Id: $ + * $Id: syscons_pc98.c,v 1.1 1999/06/24 10:51:40 kato Exp $ */ #include "sc.h" @@ -42,7 +42,7 @@ static device_method_t sc_methods[] = { static driver_t sc_driver = { SC_DRIVER_NAME, sc_methods, - 1, /* XXX */ + sizeof(sc_softc_t), }; static sc_softc_t main_softc = { 0, 0, 0, -1, NULL, -1, NULL, }; @@ -88,7 +88,7 @@ sc_softc_t main_softc.unit = unit; return &main_softc; } else { - sc = (sc_softc_t *)devclass_get_softc(sc_devclass, unit); + sc = (sc_softc_t *)device_get_softc(devclass_get_device(sc_devclass, unit)); if (!(sc->flags & SC_INIT_DONE)) { sc->unit = unit; sc->keyboard = -1; @@ -111,7 +111,7 @@ sc_softc_t return sc; units = devclass_get_maxunit(sc_devclass); for (i = 0; i < units; ++i) { - sc = (sc_softc_t *)devclass_get_softc(sc_devclass, i); + sc = (sc_softc_t *)device_get_softc(devclass_get_device(sc_devclass, i)); if (sc == NULL) continue; if (((adp == NULL) || (adp == sc->adp)) |
