From da8ca654e50d749adc89c9ba6411147634068ee9 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 20 Feb 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-02-20

---
 pc/trap.c      |  3 ++-
 pc/uarti8250.c |  2 +-
 pc/usbuhci.c   | 14 ++------------
 port/devtls.c  | 10 +++++-----
 port/lib.h     | 18 +++++++++---------
 5 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/pc/trap.c b/pc/trap.c
index 7f47817d5ce209b92f2a81e9bdd3176a269b1f14..cb2dcdb93142c6a2014dd8df494a9cd3bda67b41 100644
--- a/pc/trap.c
+++ b/pc/trap.c
@@ -473,7 +473,8 @@ fault386(Ureg* ureg, void*)
 	if(!user && mmukmapsync(addr))
 		return;
 	read = !(ureg->ecode & 2);
-if(up == nil) {print("what? up is zero pc %8lux\n", ureg->pc); for(;;);}
+	if(up == nil)
+		panic("what? up is zero pc 0x%8.8lux\n", ureg->pc);
 	insyscall = up->insyscall;
 	up->insyscall = 1;
 	n = fault(addr, read);
diff --git a/pc/uarti8250.c b/pc/uarti8250.c
index a255d2844791388c1f2d98d54f6ece13908b71a6..bdf4f4cca49cea14565738b11934fa0d03085928 100644
--- a/pc/uarti8250.c
+++ b/pc/uarti8250.c
@@ -571,7 +571,7 @@ i8250enable(Uart* uart, int ie)
 	 * The i8250 thinks the interrupt is still outstanding and does not
 	 * generate any further interrupts. To work around this we call the
 	 * interrupt handler to clear any pending inerrupt events.
-	 * Note this must be donw after setting Ier.
+	 * Note this must be done after setting Ier.
 	 */
 	if(ie)
 		i8250interrupt(nil, uart);
diff --git a/pc/usbuhci.c b/pc/usbuhci.c
index a4f22e929009d0b7a1af466c050f7cdda2c14ea2..a6c8070316e7caa0216435e56254bd510feb0bb1 100644
--- a/pc/usbuhci.c
+++ b/pc/usbuhci.c
@@ -843,13 +843,6 @@ epmode(Usbhost *uh, Endpt *e)
 	}
 }
 
-static void
-hubportreset(Udev *h, int p)
-{
-	USED(h, p);
-	/* reset state of each attached device? */
-}
-
 static	int	ioport[] = {-1, Portsc0, Portsc1};
 
 static void
@@ -883,7 +876,6 @@ portreset(Usbhost *uh, int port)
 	XPRINT("r': %x %d\n", IN(p), i);
 	OUT(p, (IN(p) & ~PortReset)|PortEnable);
 	iunlock(ctlr);
-	hubportreset(nil, port);
 	poperror();
 	qunlock(&ctlr->resetl);
 }
@@ -915,8 +907,6 @@ portenable(Usbhost *uh, int port, int on)
 	microdelay(64);
 	iunlock(ctlr);
 	XPRINT("e: %x\n", IN(p));
-	if(!on)
-		hubportreset(nil, port);
 	poperror();
 	qunlock(&ctlr->resetl);
 }
@@ -1454,8 +1444,8 @@ reset(Usbhost *uh)
 		ctlr->tdpool[i].next = ctlr->freetd;
 		ctlr->freetd = &ctlr->tdpool[i];
 	}
-	ctlr->qhpool = xspanalloc(32*sizeof(QH), 16, 0);
-	for(i=32; --i>=0;){
+	ctlr->qhpool = xspanalloc(64*sizeof(QH), 16, 0);
+	for(i=64; --i>=0;){
 		ctlr->qhpool[i].next = ctlr->freeqh;
 		ctlr->freeqh = &ctlr->qhpool[i];
 	}
diff --git a/port/devtls.c b/port/devtls.c
index a8bd70171b0b6dcb83befaeae01ab595a712b736..90bd7eacc9dbcd67efd02e915d7bbde6b5255f33 100644
--- a/port/devtls.c
+++ b/port/devtls.c
@@ -1127,7 +1127,7 @@ tlsread(Chan *c, void *a, long n, vlong off)
 		s = buf;
 		e = buf + Statlen;
 		s = seprint(s, e, "State: %s\n", tlsstate(tr->state));
-		s = seprint(s, e, "Version: 0x%lux\n", tr->version);
+		s = seprint(s, e, "Version: 0x%x\n", tr->version);
 		if(tr->in.sec != nil)
 			s = seprint(s, e, "EncIn: %s\nHashIn: %s\n", tr->in.sec->encalg, tr->in.sec->hashalg);
 		if(tr->in.new != nil)
@@ -1145,10 +1145,10 @@ tlsread(Chan *c, void *a, long n, vlong off)
 		buf = smalloc(Statlen);
 		s = buf;
 		e = buf + Statlen;
-		s = seprint(s, e, "DataIn: %d\n", tr->datain);
-		s = seprint(s, e, "DataOut: %d\n", tr->dataout);
-		s = seprint(s, e, "HandIn: %d\n", tr->handin);
-		seprint(s, e, "HandOut: %d\n", tr->handout);
+		s = seprint(s, e, "DataIn: %lld\n", tr->datain);
+		s = seprint(s, e, "DataOut: %lld\n", tr->dataout);
+		s = seprint(s, e, "HandIn: %lld\n", tr->handin);
+		seprint(s, e, "HandOut: %lld\n", tr->handout);
 		n = readstr(offset, a, n, buf);
 		free(buf);
 		return n;
diff --git a/port/lib.h b/port/lib.h
index f8aeaf260b342401bdea6d48c25df6e7a7b9a81e..ea7187a4da06b6c99f13cbcd20e189942e7927ab 100644
--- a/port/lib.h
+++ b/port/lib.h
@@ -73,16 +73,16 @@ extern	int	snprint(char*, int, char*, ...);
 extern	int	vsnprint(char*, int, char*, va_list);
 extern	int	sprint(char*, char*, ...);
 
-extern	int	fmtinstall(int c, int (*f)(Fmt*));
+extern	int	fmtinstall(int, int (*)(Fmt*));
 extern	int	quotefmtinstall(void);
-extern	int	fmtit(Fmt *f, char *fmt, ...);
-extern	int	fmtstrcpy(Fmt *f, char *s);
-
-#pragma	varargck	argpos	fmtit	2
-#pragma	varargck	argpos	print	1
-#pragma	varargck	argpos	seprint	3
-#pragma	varargck	argpos	snprint	3
-#pragma	varargck	argpos	sprint	2
+extern	int	fmtprint(Fmt*, char*, ...);
+extern	int	fmtstrcpy(Fmt*, char*);
+
+#pragma	varargck	argpos	fmtprint	2
+#pragma	varargck	argpos	print		1
+#pragma	varargck	argpos	seprint		3
+#pragma	varargck	argpos	snprint		3
+#pragma	varargck	argpos	sprint		2
 
 /*
  * one-of-a-kind