diff options
| author | nyan <nyan@FreeBSD.org> | 2000-03-29 12:26:41 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2000-03-29 12:26:41 +0000 |
| commit | ed031b005eaa9ea1bc4a341fcae0790ea6050813 (patch) | |
| tree | be478d8aad3bbcf6eae6833a4349d25a50350eea /sys/pc98/cbus/syscons_cbus.c | |
| parent | 409bbf806052ec3deb6fa3c7f799afeb0559dfb7 (diff) | |
| download | FreeBSD-src-ed031b005eaa9ea1bc4a341fcae0790ea6050813.zip FreeBSD-src-ed031b005eaa9ea1bc4a341fcae0790ea6050813.tar.gz | |
Merge from the following changes.
File Revision
sys/conf/files.i386 1.303 and 1.304
sys/dev/kbd/atkbd.c 1.23
sys/dev/syscons/scterm-sc.c 1.2
sys/dev/syscons/scvgarndr.c 1.5
sys/dev/syscons/scvtb.c 1.5
sys/dev/syscons/syscons.c 1.335
sys/isa/syscons_isa.c 1.11
sys/isa/vga_isa.c 1.17
Diffstat (limited to 'sys/pc98/cbus/syscons_cbus.c')
| -rw-r--r-- | sys/pc98/cbus/syscons_cbus.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c index d4f5bd1..7a8b584 100644 --- a/sys/pc98/cbus/syscons_cbus.c +++ b/sys/pc98/cbus/syscons_cbus.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -105,13 +102,15 @@ sc_softc_t { sc_softc_t *sc; - if ((unit < 0) || (unit >= NSC)) + if (unit < 0) return NULL; if (flags & SC_KERNEL_CONSOLE) { /* FIXME: clear if it is wired to another unit! */ sc = &main_softc; } else { sc = (sc_softc_t *)device_get_softc(devclass_get_device(sc_devclass, unit)); + if (sc == NULL) + return NULL; } sc->unit = unit; if (!(sc->flags & SC_INIT_DONE)) { @@ -213,5 +212,3 @@ sc_tone(int herz) } DRIVER_MODULE(sc, isa, sc_driver, sc_devclass, 0, 0); - -#endif /* NSC > 0 */ |
