From 281df78931d7f710d3860b1d81cc87b1a5845d0a Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 8 Aug 1997 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1997-08-08

---
 ip/ip.c       | 2 +-
 pc/devether.c | 8 ++++----
 pc/mouse.c    | 5 ++++-
 pc/scsi.c     | 3 ++-
 pc/segment.h  | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ip/ip.c b/ip/ip.c
index 66028cc30f40fbe32f6bc7c117531a134105f3aa..07501f036695d02581d241ae02a200da6268c444 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -305,7 +305,7 @@ ipstats(char *buf, int len)
 {
 	int n;
 
-	n = snprint(buf, len, "ip: csum %d inb %d outb %d inp %d outp %d\n",
+	n = snprint(buf, len, "ip: csum %lud inb %lud outb %lud inp %lud outp %lud\n",
 		ipcsumerr, ipin, ipout, ippin, ippout);
 	return n;
 }
diff --git a/pc/devether.c b/pc/devether.c
index 33a020de90b18e7b43882f82475437ebb3f26e4f..c28580f6d7a7f25a8594490161b913a63a0e3581 100644
--- a/pc/devether.c
+++ b/pc/devether.c
@@ -117,7 +117,7 @@ etherrtrace(Netfile* f, Etherpkt* pkt, int len)
 	if(bp == 0)
 		return;
 	memmove(bp->wp, pkt->d, n);
-	i = TK2MS(m->ticks);
+	i = TK2MS(MACHP(0)->ticks);
 	bp->wp[58] = len>>8;
 	bp->wp[59] = len;
 	bp->wp[60] = i>>24;
@@ -146,7 +146,7 @@ etheriq(Ether* ether, Block* bp, int freebp)
 	ep = &ether->f[Ntypes];
 
 	/* check for valid multcast addresses */
-	if((pkt->d[0] & 1) && memcmp(pkt->d, ether->bcast, sizeof(pkt->d)) != 0 && ether->prom == 0){
+	if((pkt->d[0] & 1) && memcmp(pkt->d, ether->bcast, sizeof(pkt->d)) && ether->prom == 0){
 		if(!activemulti(ether, pkt->d, sizeof(pkt->d))){
 			if(freebp){
 				freeb(bp);
@@ -209,8 +209,8 @@ etheroq(Ether* ether, Block* bp)
 	 */
 	pkt = (Etherpkt*)bp->rp;
 	len = BLEN(bp);
-	loopback = !memcmp(pkt->d, ether->ea, sizeof(pkt->d));
-	if(loopback || !memcmp(pkt->d, ether->bcast, sizeof(pkt->d)) || ether->prom){
+	loopback = (memcmp(pkt->d, ether->ea, sizeof(pkt->d)) == 0);
+	if(loopback || memcmp(pkt->d, ether->bcast, sizeof(pkt->d)) == 0 || ether->prom){
 		s = splhi();
 		etheriq(ether, bp, loopback);
 		splx(s);
diff --git a/pc/mouse.c b/pc/mouse.c
index faef3a4becf5abac1cd5e0d87ddc328d02627ca4..3bb898113485c2ad4707bb5dc4f6d08b44c68360 100644
--- a/pc/mouse.c
+++ b/pc/mouse.c
@@ -115,7 +115,10 @@ mousectl(char* arg)
 			i8042auxcmd(0xE7);
 			break;
 		default:
-			mouseaccelerate(field[1]);
+			if(n == 1)
+				mouseaccelerate("1");
+			else
+				mouseaccelerate(field[1]);
 			break;
 		}
 	} else if(strcmp(field[0], "linear") == 0){
diff --git a/pc/scsi.c b/pc/scsi.c
index a63015de930b0a7d1afdb9a26838e50b3a9fbc0f..bfc0ffad1fa10a13f34649ff6000c341bc03121d 100644
--- a/pc/scsi.c
+++ b/pc/scsi.c
@@ -320,7 +320,8 @@ scsibio(Target *t, char lun, int dir, void *b, long n, long bsize, long bno)
 		cmd[4] = n;
 		cmd[5] = 0;
 		cdbsiz = 6;
-	} else {
+	}
+	else {
 		cmd[0] = 0x2A;
 		if(dir == SCSIread)
 			cmd[0] = 0x28;
diff --git a/pc/segment.h b/pc/segment.h
index 8e177400b8f340f50f3ae4283c35ba856eb8f953..cfedf03a14688592a4758ddabc4002679021207c 100644
--- a/pc/segment.h
+++ b/pc/segment.h
@@ -6,7 +6,6 @@ Physseg physseg[] =
 {
 	{ SG_SHARED,	"lock",		0,	SEGMAXSIZE,	0, 	0 },
 	{ SG_SHARED,	"shared",	0,	SEGMAXSIZE,	0, 	0 },
-	{ SG_PHYSICAL,	"aseg",		0xa0000, 64*1024,	0,	0 },
 	{ SG_PHYSICAL,	"dseg",		0xd0000, 64*1024,	0,	0 },
 	{ SG_BSS,	"memory",	0,	SEGMAXSIZE,	0,	0 },
 	{ 0,		0,		0,	0,		0,	0 },