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

---
 ip/ethermedium.c | 6 ++++--
 pc/sdata.c       | 1 +
 pc/usbuhci.c     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ip/ethermedium.c b/ip/ethermedium.c
index 4d8605c0b42bb2cf468b7d5bf2ecfba514fac8c2..e6b4ee5c2261aad574f1d84b2cd446de4ba39554 100644
--- a/ip/ethermedium.c
+++ b/ip/ethermedium.c
@@ -431,7 +431,8 @@ recvarp(Ipifc *ifc)
 	case ARPREPLY:
 		if(iplocalonifc(ifc, ip) || ipproxyifc(er->f, ifc, ip)){
 			if(memcmp(e->sha, ifc->mac, sizeof(e->sha)) != 0){
-				print("arp: 0x%E also has ip addr %V\n", e->sha, e->spa);
+				print("arprep: 0x%E/0x%E also has ip addr %V\n",
+					e->s, e->sha, e->spa);
 				break;
 			}
 		}
@@ -447,7 +448,8 @@ recvarp(Ipifc *ifc)
 		v4tov6(ip, e->spa);
 		if(iplocalonifc(ifc, ip) || ipproxyifc(er->f, ifc, ip)){
 			if(memcmp(e->sha, ifc->mac, sizeof(e->sha)) != 0){
-				print("arp: 0x%E also has ip addr %V\n", e->sha, e->spa);
+				print("arpreq: 0x%E/0x%E also has ip addr %V\n",
+					e->s, e->sha, e->spa);
 				break;
 			}
 		} else {
diff --git a/pc/sdata.c b/pc/sdata.c
index 34102cfc2df03de8f1919df877a51dc85ad171ae..856e8ca260bca52e22aa978f1016ef72c196e45b 100644
--- a/pc/sdata.c
+++ b/pc/sdata.c
@@ -1710,6 +1710,7 @@ atapnp(void)
 		case (0x0571<<16)|0x1106:	/* VIA 82C686 */
 		case (0x0211<<16)|0x1166:	/* ServerWorks IB6566 */
 		case (0x1230<<16)|0x8086:	/* 82371FB (PIIX) */
+		case (0x248A<<16)|0x8086:	/* not sure (on Thinkpad T23) */
 		case (0x7010<<16)|0x8086:	/* 82371SB (PIIX3) */
 		case (0x7111<<16)|0x8086:	/* 82371[AE]B (PIIX4[E]) */
 			break;
diff --git a/pc/usbuhci.c b/pc/usbuhci.c
index 67834ac19787218aae5e17d3391bafb218d981f4..d47f0fd79cf30091dff74cbace3317fc8020b8d1 100644
--- a/pc/usbuhci.c
+++ b/pc/usbuhci.c
@@ -966,8 +966,8 @@ cleaniso(Endpt *e, int frnum)
 	id = (e->x<<7)|(e->dev->x&0x7F);
 	do {
 //shut up!
-		if (td->status & AnyError)
-			iprint("usbisoerror 0x%lux\n", td->status);
+//		if (td->status & AnyError)
+//			iprint("usbisoerror 0x%lux\n", td->status);
 		n = (td->status + 1) & 0x3ff;
 		e->nbytes += n;
 		if ((td->flags & IsoClean) == 0)