From 120faad055cb221acba4e60d8156226521961072 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 31 Jan 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-01-31

---
 carrera/main.c | 12 +++++++++++-
 carrera/trap.c |  4 ++--
 pc/devi82365.c |  9 ++++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/carrera/main.c b/carrera/main.c
index e76e235b9fe539e8d643d089ca0c284135bb73a6..62fcedd82c1c0def4ec602feae30aff67298988e 100644
--- a/carrera/main.c
+++ b/carrera/main.c
@@ -54,7 +54,7 @@ main(void)
 	serialinit();
 	vecinit();
 	screeninit();
-	iprint("\n\nBrazil\n");
+	print("\n\nBrazil\n");
 	pageinit();
 	procinit0();
 	initseg();
@@ -322,6 +322,16 @@ init0(void)
 	char buf[2*NAMELEN];
 
 	spllo();
+{
+	uchar *p;
+	int x;
+
+	for(p = (uchar*)(0xA0000000|16*MB); p<(uchar*)(0xA0000000|32*MB); p+=16){
+		if((((ulong)p) & 0x3FFF)==0)
+			print("%lux ", p);
+		x = *p;
+	}
+}
 
 	/*
 	 * These are o.k. because rootinit is null.
diff --git a/carrera/trap.c b/carrera/trap.c
index bdc55828e7afd4340901aadded769807a8296690..018680e08ec1c9fa09103db84c793fd0d0a52eae 100644
--- a/carrera/trap.c
+++ b/carrera/trap.c
@@ -371,7 +371,7 @@ intr(Ureg *ur)
 		devint = IO(uchar, I386ack);
 		switch(devint) {
 		default:
-			iprint("i386ACK #%lux\n", devint);
+			print("i386ACK #%lux\n", devint);
 			break;
 		case 7:
 			audiosbintr();
@@ -392,7 +392,7 @@ intr(Ureg *ur)
 	}
 
 	if(cause) {
-		iprint("cause %lux\n", cause);
+		print("cause %lux\n", cause);
 		exit(1);
 	}
 
diff --git a/pc/devi82365.c b/pc/devi82365.c
index 4a87226b1296409a01037a03d5122d4f6f2f34f6..a5eb0c00a5ca1c319e36624b87976656b825c475 100644
--- a/pc/devi82365.c
+++ b/pc/devi82365.c
@@ -163,6 +163,9 @@ struct Slot
 	ulong	caddr;		/* relative address of config registers */
 	uchar	*cisbase;	/* base of mapped in attribute space */
 	uchar	*cispos;	/* current position scanning cis */
+	ulong	maxwait;
+	ulong	readywait;
+	ulong	otherwait;
 
 	/* memory maps */
 	int	time;
@@ -1043,13 +1046,13 @@ timing(Slot *pp)
 		return;
 	i = c&0x3;
 	if(i != 3)
-		ttiming(pp, i);		/* max wait */
+		pp->maxwait = ttiming(pp, i);		/* max wait */
 	i = (c>>2)&0x7;
 	if(i != 7)
-		ttiming(pp, i);		/* max ready/busy wait */
+		pp->readywait = ttiming(pp, i);		/* max ready/busy wait */
 	i = (c>>5)&0x7;
 	if(i != 7)
-		ttiming(pp, i);		/* reserved wait */
+		pp->otherwait = ttiming(pp, i);		/* reserved wait */
 }
 
 void