diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-09-21 23:00:44 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-09-21 23:00:44 +0000 |
| commit | 59ebacf014c4049d70b36d743091ebf95aad8544 (patch) | |
| tree | 5c5965dc9a10e9520487a3665c3132ccb0968779 /sys/arch/i386/include | |
| parent | 273990fae319b25c19cc96aef9ee735ee5549c44 (diff) | |
branch the bios tree inside the machdep
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/biosvar.h | 23 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 12 |
2 files changed, 25 insertions, 10 deletions
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h index c75b0d8b8cc..4e7796565d4 100644 --- a/sys/arch/i386/include/biosvar.h +++ b/sys/arch/i386/include/biosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosvar.h,v 1.11 1997/09/17 17:56:09 mickey Exp $ */ +/* $OpenBSD: biosvar.h,v 1.12 1997/09/21 23:00:43 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -66,6 +66,23 @@ #define BIOSM_F144K 0xf0 /* floppy ds/hd 18 spt 3.50" */ #define BIOSM_OTHER 0xf0 /* any other */ +/* + * CTL_BIOS definitions. + */ +#define BIOS_DEV 1 /* int: BIOS boot device */ +#define BIOS_GEOMETRY 2 /* int: BIOS boot device geometry */ +#define BIOS_CNVMEM 3 /* int: amount of conventional memory */ +#define BIOS_EXTMEM 4 /* int: amount of extended memory */ +#define BIOS_MAXID 5 /* number of valid machdep ids */ + +#define CTL_BIOS_NAMES { \ + { 0, 0 }, \ + { "biosdev", CTLTYPE_INT }, \ + { "biosgeo", CTLTYPE_INT }, \ + { "cnvmem", CTLTYPE_INT }, \ + { "extmem", CTLTYPE_INT }, \ +} + /* * Advanced Power Management (APM) BIOS driver for laptop PCs. * @@ -243,6 +260,10 @@ struct bios_attach_args { }; struct consdev; +struct proc; + +int bios_sysctl + __P((int *, u_int, void *, size_t *, void *, size_t, struct proc *)); void bioscnprobe __P((struct consdev *)); void bioscninit __P((struct consdev *)); diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index cbe03dbb86d..813609afe05 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -206,19 +206,13 @@ void setconf __P((void)); * CTL_MACHDEP definitions. */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_BIOSDEV 2 /* int: BIOS boot device */ -#define CPU_BIOSGEOMETRY 3 /* int: BIOS boot device geometry */ -#define CPU_CNVMEM 4 /* int: amount of conventional memory */ -#define CPU_EXTMEM 5 /* int: amount of extended memory */ -#define CPU_MAXID 6 /* number of valid machdep ids */ +#define CPU_BIOS 2 /* BIOS variables */ +#define CPU_MAXID 3 /* number of valid machdep ids */ #define CTL_MACHDEP_NAMES { \ { 0, 0 }, \ { "console_device", CTLTYPE_STRUCT }, \ - { "biosdev", CTLTYPE_INT }, \ - { "biosgeo", CTLTYPE_INT }, \ - { "cnvmem", CTLTYPE_INT }, \ - { "extmem", CTLTYPE_INT }, \ + { "bios", CTLTYPE_INT }, \ } #endif /* !_I386_CPU_H_ */ |