diff options
| -rw-r--r-- | sys/arch/mvme68k/include/param.h | 69 | ||||
| -rw-r--r-- | sys/arch/pica/include/param.h | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/include/param.h | 4 |
3 files changed, 38 insertions, 41 deletions
diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h index 8c61f93adc9..e6140206e68 100644 --- a/sys/arch/mvme68k/include/param.h +++ b/sys/arch/mvme68k/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.2 1995/08/13 00:27:11 mycroft Exp $ */ +/* $NetBSD: param.h,v 1.9 1995/03/28 18:15:38 jtc Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -67,6 +67,7 @@ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ #define KERNBASE 0x00000000 /* start of kernel virtual */ +#define KERNTEXTOFF 0x00010000 /* start of kernel text */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) #define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ @@ -80,7 +81,7 @@ /* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */ #define SSIZE 1 /* initial stack size/NBPG */ #define SINCR 1 /* increment of stack/NBPG */ -#define UPAGES 3 /* pages of u-area */ +#define UPAGES 2 /* pages of u-area */ #define USPACE (UPAGES * NBPG) /* total size of u-area */ /* @@ -97,9 +98,9 @@ #ifndef NMBCLUSTERS #ifdef GATEWAY -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ +#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ #else -#define NMBCLUSTERS 256 /* map size, max cluster allocation */ +#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ #endif #endif @@ -111,12 +112,12 @@ #endif /* pages ("clicks") to disk blocks */ -#define ctod(x) ((x) << (PGSHIFT - DEV_BSHIFT)) -#define dtoc(x) ((x) >> (PGSHIFT - DEV_BSHIFT)) +#define ctod(x) ((x) << (PGSHIFT - DEV_BSHIFT)) +#define dtoc(x) ((x) >> (PGSHIFT - DEV_BSHIFT)) /* pages to bytes */ -#define ctob(x) ((x) << PGSHIFT) -#define btoc(x) (((x) + PGOFSET) >> PGSHIFT) +#define ctob(x) ((x) << PGSHIFT) +#define btoc(x) (((x) + PGOFSET) >> PGSHIFT) /* bytes to disk blocks */ #define dbtob(x) ((x) << DEV_BSHIFT) @@ -145,40 +146,36 @@ #define _spl(s) \ ({ \ - register int _spl_r; \ + register int _spl_r; \ \ - __asm __volatile ("clrl %0; movew sr,%0; movew %1,sr" : \ - "&=d" (_spl_r) : "di" (s)); \ - _spl_r; \ + __asm __volatile ("clrl %0; movew sr,%0; movew %1,sr" : \ + "&=d" (_spl_r) : "di" (s)); \ + _spl_r; \ }) /* spl0 requires checking for software interrupts */ -#define spl1() _spl(PSL_S|PSL_IPL1) -#define spl2() _spl(PSL_S|PSL_IPL2) -#define spl3() _spl(PSL_S|PSL_IPL3) -#define spl4() _spl(PSL_S|PSL_IPL4) -#define spl5() _spl(PSL_S|PSL_IPL5) -#define spl6() _spl(PSL_S|PSL_IPL6) -#define spl7() _spl(PSL_S|PSL_IPL7) - -#define splsoftclock() spl1() -#define splsoftnet() spl1() -#define splbio() spl2() -#define splnet() spl3() -#define spltty() spl3() -#define splimp() spl3() -#define splclock() spl5() -#define splstatclock() spl5() -#define splvm() spl5() -#define splhigh() spl7() -#define splsched() spl7() +#define spl1() _spl(PSL_S|PSL_IPL1) +#define spl2() _spl(PSL_S|PSL_IPL2) +#define spl3() _spl(PSL_S|PSL_IPL3) +#define spl4() _spl(PSL_S|PSL_IPL4) +#define spl5() _spl(PSL_S|PSL_IPL5) +#define spl6() _spl(PSL_S|PSL_IPL6) +#define spl7() _spl(PSL_S|PSL_IPL7) + +#define splsoftclock() spl1() +#define splsoftnet() spl1() +#define splbio() spl2() +#define splnet() spl3() +#define splimp() spl3() +#define spltty() spl3() +#define splclock() spl5() +#define splstatclock() spl5() +#define splhigh() spl7() +#define splsched() spl7() /* watch out for side effects */ -#define splx(s) (s & PSL_IPL ? _spl(s) : spl0()) +#define splx(s) (s & PSL_IPL ? _spl(s) : spl0()) #ifdef _KERNEL -#ifndef LOCORE -int cpuspeed; -#define DELAY(n) { register int N = cpuspeed * (n); while (--N > 0); } -#endif +#define DELAY(n) delay(n) #endif diff --git a/sys/arch/pica/include/param.h b/sys/arch/pica/include/param.h index 3f32862f4d8..60773bc1eb0 100644 --- a/sys/arch/pica/include/param.h +++ b/sys/arch/pica/include/param.h @@ -39,7 +39,7 @@ * * * from: @(#)param.h 8.1 (Berkeley) 6/10/93 - * $Id: param.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $ + * $Id: param.h,v 1.2 1995/10/22 06:26:07 deraadt Exp $ */ /* @@ -102,9 +102,9 @@ #define MCLOFSET (MCLBYTES - 1) #ifndef NMBCLUSTERS #ifdef GATEWAY -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ +#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ #else -#define NMBCLUSTERS 256 /* map size, max cluster allocation */ +#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ #endif #endif diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h index 25a16df9d67..c62dfcfe3cb 100644 --- a/sys/arch/sparc/include/param.h +++ b/sys/arch/sparc/include/param.h @@ -124,9 +124,9 @@ extern int nbpg, pgofset, pgshift; #ifndef NMBCLUSTERS #ifdef GATEWAY -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ +#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ #else -#define NMBCLUSTERS 256 /* map size, max cluster allocation */ +#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ #endif #endif |