From b0f0eddce0cc9ff98c029fcf84126dac48d871cd Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sun, 21 May 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-05-21

---
 mpc/devuart.c | 2 +-
 mpc/fns.h     | 2 ++
 mpc/mmu.c     | 8 ++++----
 mpc/rmap.c    | 2 +-
 mpc/spi.c     | 8 ++++----
 mpc/tar.c     | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mpc/devuart.c b/mpc/devuart.c
index b61ce5dfc911b625c66be0af1caa746d5551fd7d..2261f3a819166974dbc9140e4d46889eb8a3ec6f 100644
--- a/mpc/devuart.c
+++ b/mpc/devuart.c
@@ -1239,7 +1239,7 @@ uartstatus(Chan*, Uart *p, void *buf, long n, long offset)
 	IMM *io;
 	char str[256];
 
-	sprint(str, "opens %d ferr %lud oerr %lud crcerr %lud baud %lud perr %lud intr %lud lastc = %c", p->opens,
+	sprint(str, "opens %d ferr %lud oerr %lud crcerr %lud baud %ud perr %lud intr %lud lastc = %c", p->opens,
 		p->frame, p->overrun, p->crcerr, p->baud, p->perror, p->interrupts, lastc);
 	/* TO DO: cts, dsr, ring, dcd, dtr, rts aren't all available on 82xFADS */
 	io = m->iomem;
diff --git a/mpc/fns.h b/mpc/fns.h
index 6000cc8a82ab70fafe9d8dbb8223dd2bbad67d0a..7d65b60473d4270e3378adebe37b1a3db0ec594a 100644
--- a/mpc/fns.h
+++ b/mpc/fns.h
@@ -77,6 +77,8 @@ void	pcmunmap(int, PCMmap*);
 int		pcmspecial(char*, ISAConf*);
 void	pcmspecialclose(int);
 #define	procrestore(p)
+void	powerdownled(void);
+void	powerupled(void);
 void	procsave(Proc*);
 void	procsetup(Proc*);
 void	putdec(ulong);
diff --git a/mpc/mmu.c b/mpc/mmu.c
index 04250808715eff8f780e32876cc5270a2c874276..b80b1d013f30bfc203f7e2dbf21acc45460585e9 100644
--- a/mpc/mmu.c
+++ b/mpc/mmu.c
@@ -22,7 +22,7 @@ flushmmu(void)
 {
 	int x;
 
-if(0)print("flushmmu(%d)\n", up->pid);
+if(0)print("flushmmu(%ld)\n", up->pid);
 	x = splhi();
 	up->newtlb = 1;
 	mmuswitch(up);
@@ -49,7 +49,7 @@ if(0)print("mmuswitch()\n");
 void
 mmurelease(Proc* p)
 {
-if(0)print("mmurelease(%d)\n", p->pid);
+if(0)print("mmurelease(%ld)\n", p->pid);
 	memset(p->pidonmach, 0, sizeof p->pidonmach);
 }
 
@@ -125,7 +125,7 @@ newtlbpid(Proc *p)
 	m->pidproc[i] = p;
 	p->pidonmach[m->machno] = i;
 	m->lastpid = i;
-if(0)print("newtlbpid: pid=%d = tlbpid = %d\n", p->pid, i);
+if(0)print("newtlbpid: pid=%ld = tlbpid = %d\n", p->pid, i);
 	return i;
 }
 
@@ -152,7 +152,7 @@ putmmu(ulong va, ulong pa, Page *pg)
 	qunlock(&m->stlblk);
 
 	ctl = &pg->cachectl[m->machno];
-if(0)print("putmmu tp=%d h=%d va=%ux pa=%ux ctl=%x\n", tp, h,va, pa, *ctl);
+if(0)print("putmmu tp=%d h=%ld va=%lux pa=%lux ctl=%x\n", tp, h,va, pa, *ctl);
 	switch(*ctl) {
 	default:
 		panic("putmmu: %d\n", *ctl);
diff --git a/mpc/rmap.c b/mpc/rmap.c
index aaf5f32e300490f0ce687f8ae9d1b350c0fec6c5..964ba029d11e9cc25595ce426440222259f09068 100644
--- a/mpc/rmap.c
+++ b/mpc/rmap.c
@@ -44,7 +44,7 @@ mapfree(RMap* rmap, ulong addr, int size)
 		}
 		else do{
 			if(mp >= rmap->mapend){
-				print("mapfree: %s: losing 0x%uX, %d\n",
+				print("mapfree: %s: losing 0x%luX, %d\n",
 					rmap->name, addr, size);
 				break;
 			}
diff --git a/mpc/spi.c b/mpc/spi.c
index 2bc6d2394084362766f1c0d3f1499f1169a96f29..0fa8d32ba30d21d84038824d8a44171297d012b0 100644
--- a/mpc/spi.c
+++ b/mpc/spi.c
@@ -183,12 +183,12 @@ spdump(SPIparam *sp)
 	print("rptr = %lux\n", sp->rptr);
 	print("rbptr = %ux\n", sp->rbptr);
 	print("rcnt = %ux\n", sp->rcnt);
-	print("rtmp = %ux\n", sp->rtmp);
+	print("rtmp = %lux\n", sp->rtmp);
 	print("tstate = %lux\n", sp->tstate);
 	print("tptr = %lux\n", sp->tptr);
 	print("tbptr = %ux\n", sp->tbptr);
 	print("tcnt = %ux\n", sp->tcnt);
-	print("ttmp = %ux\n", sp->ttmp);
+	print("ttmp = %lux\n", sp->ttmp);
 }
 
 void
@@ -228,7 +228,7 @@ spdump(ctlr->sp);
 m->iomem->pbdat |= IBIT(31);
 microdelay(1);
 	ctlr->spi->spcom = 1<<7;	/* transmit now */
-print("cpcom = %ux\n", &ctlr->spi->spcom);
+print("cpcom = %p\n", &ctlr->spi->spcom);
 spdump(ctlr->sp);
 	eieio();
 	ctlr->ntq++;
@@ -243,7 +243,7 @@ delay(100);
 	dre = &ctlr->rdr[ctlr->rdrx];
 	status = dre->status;
 	len = dre->length;
-print("%d status = %ux len=%d\n", ctlr->rdrx, status, len);
+print("%d status = %lux len=%d\n", ctlr->rdrx, status, len);
 	b = iallocb(len);
 	memmove(b->wp, KADDR(dre->addr), len);
 	b->wp += len;
diff --git a/mpc/tar.c b/mpc/tar.c
index 7e9efdc1945b0382ae71874d02abd57cd1eee59e..108dd8eb0675b2d666c07afc3e2cbeea3215b2c9 100644
--- a/mpc/tar.c
+++ b/mpc/tar.c
@@ -36,7 +36,7 @@ tarlookup(uchar *addr, char *file, int *dlen)
 	Hblock *hp;
 	Dir dir;
 
-print("tarlookup: %x\n", addr);
+print("tarlookup: %p\n", addr);
 	hp = (Hblock*)addr;
 	while(getdir(hp, &dir) != 0) {
 print("name = %s\n", hp->dbuf.name);