3 files changed, 19 insertions(+), 6 deletions(-)

M carrera/main.c
M carrera/trap.c
M pc/devi82365.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.

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

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