2 files changed, 7 insertions(+), 47 deletions(-)

M pc/devastar.c
M pc/memory.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);
 

@@ 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;
 }