From 9454ebd7fa28309751ee4dbcd9eaab90e83c7b72 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 13 May 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-05-13

---
 pc/devether.c | 8 ++++----
 pc/scsi.c     | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pc/devether.c b/pc/devether.c
index 93f2e8e86f4fc163a026ef5f9c7c6aef7f9f2dc2..daf31a8cc5f5aba2fcccffd58f27c71e293dfc7d 100644
--- a/pc/devether.c
+++ b/pc/devether.c
@@ -209,15 +209,15 @@ etherreset(void)
 				ctlr->irq = 9;
 			setvec(Int0vec+ctlr->irq, ctlr->interrupt, ctlr);
 
-			print("ether%d: %s: port 0x%lux irq %d",
+			print("ether%d: %s: port 0x%luX irq %d",
 				ctlrno, ctlr->type, ctlr->port, ctlr->irq);
 			if(ctlr->mem)
-				print(" addr 0x%lux", ctlr->mem & ~KZERO);
+				print(" addr 0x%luX", ctlr->mem & ~KZERO);
 			if(ctlr->size)
-				print(" size 0x%lux", ctlr->size);
+				print(" size 0x%luX", ctlr->size);
 			print(":");
 			for(i = 0; i < sizeof(ctlr->ea); i++)
-				print(" %2.2ux", ctlr->ea[i]);
+				print(" %2.2uX", ctlr->ea[i]);
 			print("\n");
 
 			netifinit(ctlr, "ether", Ntypes, 32*1024);
diff --git a/pc/scsi.c b/pc/scsi.c
index c9eb371c906f82eb04b918801fa4afd08e86b09c..fbcc5b10702d2481bcd959d59efd05239e15b7a8 100644
--- a/pc/scsi.c
+++ b/pc/scsi.c
@@ -76,11 +76,13 @@ scsireset(void)
 			if((ctlr->io = (*lp->reset)(ctlrno, ctlr)) == 0)
 				break;
 
-			print("scsi%d: %s: port %lux irq %d",
+			print("scsi%d: %s: port 0x%luX irq %d",
 				ctlrno, ctlr->type, ctlr->port,
 				ctlr->irq, ctlr->mem, ctlr->size);
 			if(ctlr->mem)
-				print(" addr %lux size %d\n", ctlr->mem, ctlr->size);
+				print(" addr 0x%luX", ctlr->mem & ~KZERO);
+			if(ctlr->size)
+				print(" size 0x%luX", ctlr->size);
 			print("\n");
 
 			for(t = 0; t < NTarget; t++){
@@ -203,7 +205,6 @@ scsiinv(int devno, int *type, Target **rt, uchar **inq, char *id)
 				*rt = t;
 				*inq = t->inq;
 				sprint(id, "scsi%d: unit %d", ctlr, unit);
-print("devno %d = %s\n", devno, id);
 				return devno;
 			}
 		}