UVM changes mainly. As of this checkin UVM is still not working for powerpc

it has a copyin bug after device configuration. However to get these diffs
out of my tree.

All of the UVM code is currently inside ifdef UVM the kernel works fine
without option UVM. Config files have been left without UVM for now.

Prelimiary changes for busdma, (what UVM was wanted for).

2 files changed, 11 insertions, 1 deletions

diff --git a/sys/arch/powerpc/pci/macobio.c b/sys/arch/powerpc/pci/macobio.c
index f7d9de1b34b..3d566ef19f1 100644
--- a/sys/arch/powerpc/pci/macobio.c
+++ b/sys/arch/powerpc/pci/macobio.c
@@ -89,7 +89,11 @@ u_int32_t *heathrow_FCR = NULL;
 
 void prog_switch (void *arg)
 {
+#ifdef DDB
 	Debugger();
+#else
+	printf("programmer button pressed, debugger not available\n");
+#endif
 }
 
 /*
diff --git a/sys/arch/powerpc/pci/mpcpcibus.c b/sys/arch/powerpc/pci/mpcpcibus.c
index 18fa6b7f103..0937b1f2a7b 100644
--- a/sys/arch/powerpc/pci/mpcpcibus.c
+++ b/sys/arch/powerpc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibus.c,v 1.10 1999/11/08 23:49:00 rahnds Exp $ */
+/*	$OpenBSD: mpcpcibus.c,v 1.11 2000/01/14 05:42:16 rahnds Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -443,7 +443,9 @@ mpc_conf_read(cpv, tag, offset)
 	device = (tag >> 11) & 0x1f;
 	if(device > 11)
 		return(~0);	/* Outside config space */
+#if 0
 	printf("mpc_conf_read tag %x offset %x: ", tag, offset);
+#endif
 
 	addr = (0x800 << device) | (tag & 0x380) | offset;
 
@@ -455,7 +457,9 @@ mpc_conf_read(cpv, tag, offset)
 
 	splx(s);
 	ppc_close_pci_bridge(handle);
+#if 0
 	printf("data %x\n", data);
+#endif
 
 	return(data);
 }
@@ -471,7 +475,9 @@ mpc_conf_write(cpv, tag, offset, data)
 	int device;
 	int s;
 	int handle; 
+#if 0
 	printf("mpc_conf_write tag %x offset %x data %x\n", tag, offset, data);
+#endif
 
 	device = (tag >> 11) & 0x1f;
 	addr = (0x800 << device) | (tag & 0x380) | offset;