6 files changed, 13 insertions(+), 11 deletions(-)

M mpc/devuart.c
M mpc/fns.h
M mpc/mmu.c
M mpc/rmap.c
M mpc/spi.c
M mpc/tar.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;

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

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

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

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

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