diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-09-21 05:18:08 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-09-21 05:18:08 +0000 |
| commit | 16e42db38570fefdd87f667d985a2ad3458ac33d (patch) | |
| tree | f86bfed415aadbd5b93138bd406990a1de487872 /sys/arch/i386 | |
| parent | 88a797fc96f72c18ac54be88422421d13e8d2f68 (diff) | |
bootapiver is unsigned
don'tprint entry point, which is valid at the moment
don't support new CPU* sysctls being boot w/ old boots
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/bios.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index ccb22586d82..f390ad98976 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.1 1997/09/21 04:27:53 mickey Exp $ */ +/* $OpenBSD: bios.c,v 1.2 1997/09/21 05:18:07 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -140,7 +140,7 @@ biosprobe(parent, match, aux) void *match, *aux; { struct bios_attach_args *bia = aux; - extern int bootapiver; /* locore.s */ + extern u_int bootapiver; /* locore.s */ if (bootapiver == 0) return 0; @@ -190,9 +190,8 @@ biosattach(parent, self, aux) case 0xf9: p = "PC Convertible";break; case 0xf8: p = "PS/2 386+"; break; } - printf(": %s(%02x) BIOS, date %c%c/%c%c/%c%c; entry %x:%x\n", - p, va[15], va[5], va[6], va[8], va[9], va[11], va[12], - bios_kentry.cs, bios_kentry.ip); + printf(": %s(%02x) BIOS, date %u%c%c/%c%c/%c%c\n", + p, va[15], va[5], va[6], va[8], va[9], va[11], va[12]); #ifdef DEBUG printf("apminfo: %x, code %x/%x[%x], data %x[%x], entry %x\n", BIOS_vars.apm_detail, BIOS_vars.apm_code32_base, @@ -316,13 +315,16 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) size_t newlen; struct proc *p; { - extern u_int cnvmem, extmem; + extern u_int cnvmem, extmem, bootapiver; /* locore.s */ dev_t consdev; /* all sysctl names at this level are terminal */ if (namelen != 1) return (ENOTDIR); /* overloaded */ + if (bootapiver == 0 && name[0] != CPU_CONSDEV) + return EOPNOTSUPP; + switch (name[0]) { case CPU_CONSDEV: if (cn_tab != NULL) |