From 218d348dd0ae983eed20e47f6f21e6e5813364fa Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 26 Sep 1998 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1998-09-26

---
 pc/devastar.c | 45 ---------------------------------------------
 pc/memory.c   |  9 +++++++--
 2 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/pc/devastar.c b/pc/devastar.c
index af1ae9f2217e03d83aed0352d7b9a5b4a02b763c..103503e7111df76d25c6bd59fb5ce117c6d28f39 100644
--- a/pc/devastar.c
+++ b/pc/devastar.c
@@ -1089,51 +1089,6 @@ bctlwrite(Astar *a, char *cmsg)
 		/* start up downloaded program */
 		startcp(a);
 
-	} else if(strncmp(cmsg, "test", 4) == 0){
-		uchar *p;
-
-#ifdef notdef
-		p = a->addr;
-		a->page = -1;
-		setpage(a, 16*1024);
-		*p = 'X';
-		p = a->addr;
-		print("page0: %8.8uX %2.2uX\n", inl(a->port+PCIremap), *p);
-		setpage(a, 2*16*1024);
-		print("page1: %8.8uX %2.2uX\n", inl(a->port+PCIremap), *p);
-		p = a->addr;
-		*p = 'Y';
-		p = a->addr;
-		print("page1: %8.8uX %2.2uX\n", inl(a->port+PCIremap), *p);
-		setpage(a, 16*1024);
-		p = a->addr;
-		print("page0: %8.8uX %2.2uX\n", inl(a->port+PCIremap), *p);
-#else
-		p = a->addr;
-		*p = 'A';
-		print(" 0K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-
-		p = a->addr+(16*1024);
-		*p = 'B';
-		print("16K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-
-		p = a->addr;
-		print(" 0K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-
-		*p = 'C';
-		print(" 0K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-
-		p = a->addr+(64*1024);
-		*p = 'D';
-		print("64K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-
-		p = a->addr;
-		print(" 0K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-
-		p = a->addr+(16*1024);
-		print("16K: %8.8luX %2.2uX\n", inl(a->port+PCIremap), *p);
-#endif /* notdef */
-
 	} else
 		error(Ebadarg);
 
diff --git a/pc/memory.c b/pc/memory.c
index 691f0b8b67e7441732a0d07fae10115dc627f2b9..f23220a9b74546ad4ef00f8e266d26a616deac4a 100644
--- a/pc/memory.c
+++ b/pc/memory.c
@@ -520,8 +520,10 @@ upamalloc(ulong pa, int size, int align)
 	 * Therefore, if pa is 0 mapalloc will choose the base address.
 	 * Note, however, mmukmap is always asked to give a 1-to-1 mapping
 	 * of va to pa.
-	 */
 	ae = mmukmap(a, a, size);
+	 * ...but for the moment go back to the old scheme for VLB cards.
+	 */
+	ae = mmukmap(a, 0, size);
 
 	/*
 	 * Should check here that it was all delivered
@@ -530,7 +532,10 @@ upamalloc(ulong pa, int size, int align)
 	USED(ae);
 
 	/*
-	 * Be very careful this returns a PHYSICAL address.
+	 * Be very careful this returns a PHYSICAL address
+	 * mapped 1-to-1 with the virtual address.
+	 * If a < KZERO it's probably not a good idea to
+	 * try KADDR(a)...
 	 */
 	return a;
 }