[src/trunk]: src/sys/arch/pmax/include - Remove three unused contants; KERNBA...

[nisimura <nisimura%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9638f2083521
branches:  trunk
changeset: 485806:9638f2083521
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Sat May 06 05:55:09 2000 +0000

description:
- Remove three unused contants; KERNBASE, KERNTEXTOFF and BTOPKERNBASE.
- Protect #include <machine/intr.h> inclusion with #ifdef _KERNEL.
- Correct the case when "opt_gateway.h" is refered.

diffstat:

 sys/arch/pmax/include/param.h |  18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diffs (62 lines):

diff -r e8bc39328dd5 -r 9638f2083521 sys/arch/pmax/include/param.h
--- a/sys/arch/pmax/include/param.h     Sat May 06 05:32:28 2000 +0000
+++ b/sys/arch/pmax/include/param.h     Sat May 06 05:55:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.31 2000/03/30 14:45:12 simonb Exp $        */
+/*     $NetBSD: param.h,v 1.32 2000/05/06 05:55:09 nisimura Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -61,10 +61,6 @@
 #define        MACHINE         "pmax"
 #define        MID_MACHINE     MID_PMAX
 
-#define        KERNBASE        0x80000000      /* start of kernel virtual */
-#define KERNTEXTOFF    0x80030000      /* start of kernel text for kvm_mkdb */
-#define        BTOPKERNBASE    ((u_long)KERNBASE >> PGSHIFT)
-
 #define        DEV_BSIZE       512
 #define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
 #define BLKDEV_IOSIZE  2048
@@ -80,20 +76,17 @@
 #define        MSIZE           128             /* size of an mbuf */
 
 #ifndef MCLSHIFT
-
-# define       MCLSHIFT        11      /* convert bytes to m_buf clusters */
-                                       /* 2K cluster can hold Ether frame */
+# define MCLSHIFT      11              /* convert bytes to m_buf clusters */
 #endif /* MCLSHIFT */
 
 #define        MCLBYTES        (1 << MCLSHIFT) /* size of a m_buf cluster */
 #define        MCLOFSET        (MCLBYTES - 1)
 
-#ifndef NMBCLUSTERS
-
 #if defined(_KERNEL) && !defined(_LKM)
 #include "opt_gateway.h"
 #endif /* _KERNEL && ! _LKM */
 
+#ifndef NMBCLUSTERS
 #ifdef GATEWAY
 #define        NMBCLUSTERS     2048            /* map size, max cluster allocation */
 #else
@@ -101,8 +94,6 @@
 #endif
 #endif
 
-#include <machine/intr.h>
-
 #ifdef _KERNEL
 #ifndef _LOCORE
 
@@ -110,6 +101,9 @@
 extern int cpuspeed;
 #define        DELAY(n)        { int N = cpuspeed * (n); while (--N > 0); }
 
+#include <machine/intr.h>
+
+
 #endif /* !_LOCORE */
 #endif /* _KERNEL */