diff options
| author | kato <kato@FreeBSD.org> | 1998-08-31 08:41:58 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-08-31 08:41:58 +0000 |
| commit | 173369820ffebcaea03f21e11551083dda01b0fd (patch) | |
| tree | 16c4b7356ea2313bd6e0106614e2234bcc10f3b9 /sys/i386 | |
| parent | 6185272d7d0d6fcd90042bff942253302dab8a80 (diff) | |
| download | FreeBSD-src-173369820ffebcaea03f21e11551083dda01b0fd.zip FreeBSD-src-173369820ffebcaea03f21e11551083dda01b0fd.tar.gz | |
- hw.machine_arch returns cpu architecture type.
- moved definition of MACHINE_ARCH from cpu.h to parm.h as alpha.
- Added definitions of _MACHINE and _MACHINE_ARCH.
- Added hw.ispc98. The hw.ispc98 is 1 in PC98 kernel and is 0 in
IBM-PC kernel.
Discussed with: John Birrell <jb@FreeBSD.ORG>
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/machdep.c | 8 | ||||
| -rw-r--r-- | sys/i386/include/cpu.h | 13 | ||||
| -rw-r--r-- | sys/i386/include/param.h | 6 |
3 files changed, 12 insertions, 15 deletions
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index f0db465..a04409f 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.303 1998/07/11 07:45:30 bde Exp $ + * $Id: machdep.c,v 1.304 1998/08/18 07:46:58 msmith Exp $ */ #include "apm.h" @@ -169,6 +169,12 @@ SYSCTL_INT(_debug, OID_AUTO, tlb_flush_count, CTLFLAG_RD, &tlb_flush_count, 0, ""); #endif +#ifdef PC98 +int ispc98 = 1; +#else +int ispc98 = 0; +#endif +SYSCTL_INT(_hw, OID_AUTO, ispc98, CTLFLAG_RD, &ispc98, 0, ""); int physmem = 0; int cold = 1; diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 4b5e6e9..7b2ef5b 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $Id: cpu.h,v 1.34 1997/10/27 17:23:02 bde Exp $ + * $Id: cpu.h,v 1.35 1997/10/28 11:43:47 bde Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -48,17 +48,6 @@ #include <machine/segments.h> /* - * Architecture dependent constant for i386 based machines. - */ -#ifdef PC98 -/* NEC PC-9801/9821 series and compatibles. */ -#define MACHINE_ARCH "pc-98" -#else -/* IBM-PC compatibles. */ -#define MACHINE_ARCH "ibm-pc" -#endif - -/* * definitions of cpu-dependent requirements * referenced in generic code */ diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index 87fe41d..cd566e2 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.43 1998/06/14 15:21:27 bde Exp $ + * $Id: param.h,v 1.44 1998/06/15 04:50:55 bde Exp $ */ #ifndef _MACHINE_PARAM_H_ @@ -43,8 +43,10 @@ /* * Machine dependent constants for Intel 386. */ - +#define _MACHINE i386 #define MACHINE "i386" +#define _MACHINE_ARCH i386 +#define MACHINE_ARCH "i386" #define MID_MACHINE MID_I386 #ifdef SMP |
