New RAMDISK configuration, inspired by the mvme68k one; and the associated

fixes to get the kernel to compile without option DDB and without
option DIAGNOSTIC.

3 files changed, 36 insertions, 26 deletions

diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index 284f38fedc2..d86d5d48b30 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,9 +1,10 @@
-#	$OpenBSD: RAMDISK,v 1.12 2002/03/14 00:47:58 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.13 2003/08/09 21:19:58 miod Exp $
 
 machine		mvme88k 
 
-include "../../../conf/GENERIC"
-rmoption	PTRACE
+# 2 meg ramdisk
+option		MINIROOTSIZE=4096
+option		RAMDISK_HOOKS
 
 option		MVME187		# support for 187
 option		MVME188		# support for 188
@@ -15,23 +16,31 @@ option		BUGMAP		# use the Bug ROM VME mappings
 # Define this if your processor has the xxx.usr bug (mask C82N)
 option		ERRATA__XXX_USR	
 
-maxusers	8
+maxusers	32
 
-config		bsd		root rd0 swap rd0
+option		SCSITERSE
+option		SMALL_KERNEL
+option		NO_PROPOLICE
+option		TIMEZONE=0
+option		DST=0
+option		FFS
+option		NFSCLIENT
+option		CD9660
+option		FIFO
+option		INET
+option		BOOT_CONFIG
+
+config		bsd		root rd0 swap on rd0b
 
-# ------------------------------ devices --------------------------------
 mainbus0 at root
 
-# ------------------------------ mainbus devices ------------------------
 bugtty0 at mainbus0
 bussw0  at mainbus0 addr 0xfff00000
 pcctwo0 at mainbus0 addr 0xfff00000
 syscon0 at mainbus0 addr 0xfff00000
 
-# ---------------------------- bus swicth devices -----------------------
 pcctwo0 at bussw0 offset 0x42000
 
-# ------------------------------ pcctwo devices -------------------------
 clock0	at pcctwo0 ipl 5
 sclock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
@@ -40,18 +49,15 @@ ie0	at pcctwo0 offset 0x46000 ipl 1
 ssh0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 
-# ------------------------------ syscon0 devices ------------------------
 clock0	at syscon0 ipl 5
 sclock0	at syscon0 ipl 5
 nvram0	at syscon0 offset 0x80000
 dart0	at syscon0 offset 0x82000 ipl 3
 vme0	at syscon0 offset 0x85000
 
-# ------------------------------ vme0 devices --------------------------
 vmes0	at vme0
 vmel0	at vme0
 
-# ------------------------------ vmes0 devices -------------------------
 vx0	at vmes0 addr 0xff780000 ipl 3 len 0x10000
 vx1	at vmes0 addr 0xff790000 ipl 3 len 0x10000
 vx2	at vmes0 addr 0xff7a0000 ipl 3 len 0x10000
@@ -66,18 +72,13 @@ vs3	at vmes0 addr 0xffff5800 ipl 2 len 0x800
 vs4	at vmes0 addr 0xffff7000 ipl 2 len 0x800
 vs5	at vmes0 addr 0xffff7800 ipl 2 len 0x800
 
-# ------------------------------ svme0 devices -------------------------
 scsibus* at vs?
-
-# ------------------------------ ssh0 devices --------------------------
 scsibus* at ssh?
 
-# ------------------------------ scsibus0 devices ----------------------
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
 
-# ------------------------------ pseudo devices ------------------------
-option MINIROOTSIZE=8192
-option RAMDISK_HOOKS
-pseudo-device	rd 2
+pseudo-device	loop	1
+pseudo-device	bpfilter 1
+pseudo-device	rd	1
diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c
index 736d6d5b042..78fdbbea81a 100644
--- a/sys/arch/mvme88k/mvme88k/m8820x.c
+++ b/sys/arch/mvme88k/mvme88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.14 2002/03/14 03:15:57 millert Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.15 2003/08/09 21:19:59 miod Exp $	*/
 /*
  * Copyright (c) 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -2130,8 +2130,6 @@ m8820x_cmmu_cache_state(addr, supervisor_flag)
 
 }
 
-#endif /* DDB */
-
 void
 m8820x_show_cmmu_info(addr)
 	unsigned addr;
@@ -2148,4 +2146,5 @@ m8820x_show_cmmu_info(addr)
 		}
 }
 
+#endif /* DDB */
 #endif /* M88100 */
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index f7c168c4bc5..23489ecb2b9 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.39 2003/01/13 20:12:18 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.40 2003/08/09 21:19:59 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -695,7 +695,9 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame)
 	unsigned nss, fault_addr;
 	struct vmspace *vm;
 	union sigval sv;
+#ifdef DDB
         int s; /* IPL */
+#endif
 	int result = 0;  /* Assume Success */
 	int sig = 0;
 	unsigned pc = PC_REGS(frame);  /* get program counter (exip) */
@@ -711,7 +713,11 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame)
 	if ((p = curproc) == NULL)
 		p = &proc0;
 #if 1
-	if (type != T_INT && type != T_ASTFLT && type != T_KDB_ENTRY ) {
+	if (type != T_INT && type != T_ASTFLT
+#ifdef DDB
+	    && type != T_KDB_ENTRY
+#endif
+	   ) {
 		printf("m88110_trap: %d %s\n", type, frame->vector < trap_types ? trap_type[frame->vector] : "unknown");
 	}
 #endif
@@ -744,7 +750,7 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame)
 		DEBUG_MSG("IMMU miss: Hardware Table Searches should be enabled!\n");
 		panictrap(frame->vector, frame);
 		/*NOTREACHED*/
-   #if defined(DDB)
+#ifdef DDB
 	case T_KDB_TRACE:
 		s = splhigh();
 		db_enable_interrupt();
@@ -1220,7 +1226,9 @@ m88100_syscall(register_t code, struct m88100_saved_state *tf)
 	} args;
 	int rval[2];
 	u_quad_t sticks;
+#ifdef DIAGNOSTIC
 	extern struct pcb *curpcb;
+#endif
 
 	uvmexp.syscalls++;
 
@@ -1384,7 +1392,9 @@ m88110_syscall(register_t code, struct m88100_saved_state *tf)
 	} args;
 	int rval[2];
 	u_quad_t sticks;
+#ifdef DIAGNOSTIC
 	extern struct pcb *curpcb;
+#endif
 
 	uvmexp.syscalls++;