diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2001-12-19 07:04:43 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2001-12-19 07:04:43 +0000 |
| commit | 8130d56a7bb2e09e2c8b782f3f4a54133a0bb161 (patch) | |
| tree | 1dd36d374c7d72391551b03ca96630523b33efe7 /sys/arch/mvme88k/include | |
| parent | 0941b7f1f3dcc38dc20d2613943aa615d5b3c25b (diff) | |
Introduce brdtyp and change what cputyp means.
Diffstat (limited to 'sys/arch/mvme88k/include')
| -rw-r--r-- | sys/arch/mvme88k/include/cpu_number.h | 5 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/cpus.h | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/include/param.h | 24 |
3 files changed, 25 insertions, 12 deletions
diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h index 51bd18ce32e..7744fc4d8ed 100644 --- a/sys/arch/mvme88k/include/cpu_number.h +++ b/sys/arch/mvme88k/include/cpu_number.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu_number.h,v 1.8 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: cpu_number.h,v 1.9 2001/12/19 07:04:41 smurph Exp $ */ /* * Mach Operating System @@ -39,8 +39,7 @@ static unsigned cpu_number __P((void)); static __inline__ unsigned cpu_number(void) { register unsigned cpu; - - if (cputyp != CPU_188 || number_cpus == 1) return 0; + if (brdtyp != BRD_188 || number_cpus == 1) return 0; __asm__ ("ldcr %0, cr18" : "=r" (cpu)); return (cpu & 3); } diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h index aecc8d49114..ecf5bd9e2d5 100644 --- a/sys/arch/mvme88k/include/cpus.h +++ b/sys/arch/mvme88k/include/cpus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpus.h,v 1.10 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: cpus.h,v 1.11 2001/12/19 07:04:41 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -58,8 +58,8 @@ union cpupid { }; #endif /* _LOCORE */ -#define M88100 0 -#define M88200 5 -#define M88204 6 +#define M88100_ID 0 +#define M88200_ID 5 +#define M88204_ID 6 #endif /* __MACHINE_CPUS_H__ */ diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h index f5349e16a24..ca85f79244e 100644 --- a/sys/arch/mvme88k/include/param.h +++ b/sys/arch/mvme88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.25 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: param.h,v 1.26 2001/12/19 07:04:41 smurph Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -173,16 +173,30 @@ extern int delay __P((int)); #define DELAY(x) delay(x) extern int cputyp; +extern int brdtyp; extern int cpumod; #endif /* + * Values for the brdtyp variable. + */ +#define BRD_187 0x187 +#define BRD_188 0x188 +#define BRD_197 0x197 +#define BRD_8120 0x8120 + +/* * Values for the cputyp variable. */ -#define CPU_187 0x187 -#define CPU_188 0x188 -#define CPU_197 0x197 -#define CPU_8120 0x8120 +#define CPU_88100 0x100 +#define CPU_88110 0x110 + +/* + * Values for the cpumod variable. + */ +#define MOD_LE 0x01 +#define MOD_SP 0x02 +#define MOD_DP 0x03 #endif /* !_MACHINE_PARAM_H_ */ |