--- Net2/arch/i386/include/param.h 2018/04/24 18:04:01 1.1 +++ Net2/arch/i386/include/param.h 2018/04/24 18:20:41 1.1.1.3 @@ -33,14 +33,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)param.h 5.8 (Berkeley) 6/28/91 + * from: @(#)param.h 5.8 (Berkeley) 6/28/91 + * param.h,v 1.7 1993/07/05 01:12:46 deraadt Exp */ /* * Machine dependent constants for Intel 386. */ -#define MACHINE "i386" +#define MACHINE "i386" +#define MID_MACHINE MID_I386 /* * Round p (pointer or byte index) up to a correctly-aligned value @@ -82,10 +84,14 @@ * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple * of the hardware page size. */ +#ifndef MSIZE #define MSIZE 128 /* size of an mbuf */ -#define MCLBYTES 1024 -#define MCLSHIFT 10 -#define MCLOFSET (MCLBYTES - 1) +#endif +#ifndef MCLSHIFT +#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ +#endif +#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ +#define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */ #ifndef NMBCLUSTERS #ifdef GATEWAY #define NMBCLUSTERS 512 /* map size, max cluster allocation */ @@ -98,7 +104,7 @@ * Size of kernel malloc arena in CLBYTES-sized logical pages */ #ifndef NKMEMCLUSTERS -#define NKMEMCLUSTERS (2048*1024/CLBYTES) +#define NKMEMCLUSTERS (3072*1024/CLBYTES) #endif /* * Some macros for units conversion @@ -142,13 +148,3 @@ #define i386_dtob(x) ((unsigned)(x) << PDRSHIFT) #define i386_btop(x) ((unsigned)(x) >> PGSHIFT) #define i386_ptob(x) ((unsigned)(x) << PGSHIFT) - -#ifdef KERNEL -#ifndef LOCORE -int cpuspeed; -#endif -#define DELAY(n) { register int N = cpuspeed * (n); while (--N > 0); } - -#else -#define DELAY(n) { register int N = (n); while (--N > 0); } -#endif