From 5aebc195939a649a52a3c556ccf643b882f664d8 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 25 Mar 1991 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1991-03-25

---
 gnot/fns.h      |  1 -
 port/devlance.c |  7 ++++---
 power/fns.h     | 18 +++++++++---------
 ss/fns.h        |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnot/fns.h b/gnot/fns.h
index d617cb60cefcd7dc4d941ca2e4d1895319cc1238..f603df37f7defb1f94101ffc6058655a9675a6eb 100644
--- a/gnot/fns.h
+++ b/gnot/fns.h
@@ -35,7 +35,6 @@ int	devno(int, int);
 Chan	*devopen(Chan*, int, Dirtab*, int, Devgen*);
 void	devstat(Chan*, char*, Dirtab*, int, Devgen*);
 int	devwalk(Chan*, char*, Dirtab*, int, Devgen*);
-Chan	*domount(Chan*);
 void	duartbaud(int);
 void	duartbreak(int);
 void	duartdtr(int);
diff --git a/port/devlance.c b/port/devlance.c
index edf34352e0c1d1813472fb73b8bcb7e25160cef4..705fb7ea26f5a0f2f2c39d00b99efea057e03111 100644
--- a/port/devlance.c
+++ b/port/devlance.c
@@ -664,9 +664,10 @@ lanceread(Chan *c, void *a, long n)
 	case CHDIR:
 		return devdirread(c, a, n, lancedir, Ndir, devgen);
 	case Lstatsqid:
-		sprint(buf, "in: %d\nout: %d\ncrc errs %d\noverflows: %d\nframe errs %d\nbuff errs: %d\noerrs %d\n",
-			l.inpackets, l.outpackets, l.crcs, l.overflows, l.frames,
-			l.buffs, l.oerrs);
+		sprint(buf, "in: %d\nout: %d\ncrc errs %d\noverflows: %d\nframe errs %d\nbuff errs: %d\noerrs %d\naddr: %.02x:%.02x:%.02x:%.02x:%.02x:%.02x\n",
+		l.inpackets, l.outpackets, l.crcs,
+		l.overflows, l.frames, l.buffs, l.oerrs,
+		l.ea[0], l.ea[1], l.ea[2], l.ea[3], l.ea[4], l.ea[5]);
 		return stringread(c, a, n, buf);
 	case Ltraceqid:
 		return lancetraceread(c, a, n);
diff --git a/power/fns.h b/power/fns.h
index 944f39c708d98775b41d250929b0ef132964398f..01c614591714ad8ef81b2570276db2426c4652e9 100644
--- a/power/fns.h
+++ b/power/fns.h
@@ -40,7 +40,7 @@ void	devdir(Chan*, Qid, char*, long, long, Dir*);
 long	devdirread(Chan*, char*, long, Dirtab*, int, Devgen*);
 Devgen	devgen;
 int	devno(int, int);
-Chan*	devopen(Chan*, int, Dirtab*, int, Devgen*);
+Chan	*devopen(Chan*, int, Dirtab*, int, Devgen*);
 void	devstat(Chan*, char*, Dirtab*, int, Devgen*);
 int	devwalk(Chan*, char*, Dirtab*, int, Devgen*);
 void	duartinit(void);
@@ -63,7 +63,7 @@ int	fault(ulong, int);
 void	faultmips(Ureg*, int, int);
 ulong	fcr31(void);
 void	fdclose(int);
-Chan*	fdtochan(int, int);
+Chan	*fdtochan(int, int);
 void	firmware(void);
 void	flowctl(Queue*);
 void	flushmmu(void);
@@ -120,14 +120,14 @@ void	newstart(void);
 int	newtlbpid(Proc*);
 int	nonetcksum(Block*, int);
 void	nonetfreeifc(Noifc*);
-Noifc*	nonetnewifc(Queue*, Stream*, int, int, int, void (*)(Noconv*, char*));
+Noifc	*nonetnewifc(Queue*, Stream*, int, int, int, void (*)(Noconv*, char*));
 void	nonetrcvmsg(Noconv*, Block*);
 void	notify(Ureg*);
 void	novme(int);
 void	nullput(Queue*, Block*);
 void	online(void);
 int	openmode(ulong);
-Block*	padb(Block*, int);
+Block	*padb(Block*, int);
 void	pageinit(void);
 void	panic(char*, ...);
 void	pexit(char*, int);
@@ -144,7 +144,7 @@ void	printslave(void);
 void	procinit0(void);
 Proc	*proctab(int);
 void	purgetlb(int);
-Queue*	pushq(Stream*, Qinfo*);
+Queue	*pushq(Stream*, Qinfo*);
 void	putmmu(ulong, ulong);
 void	puttlb(ulong, ulong);
 void	puttlbx(int, ulong, ulong);
@@ -170,9 +170,9 @@ int	segaddr(Seg*, ulong, ulong);
 int	setlabel(Label*);
 void	setvmevec(int, void (*)(int));
 void	sinit(void);
-char*	skipslash(char*);
+char	*skipslash(char*);
 void	sleep(Rendez*, int(*)(void*), void*);
-uchar*	smap(int, uchar*);
+uchar	*smap(int, uchar*);
 int	splhi(void);
 int	spllo(void);
 void	splx(int);
@@ -186,7 +186,7 @@ void	streaminit(void);
 void	streaminit0(void);
 long	streamread(Chan*, void*, long);
 long	streamwrite(Chan*, void*, long, int);
-Stream*	streamnew(ushort, ushort, ushort, Qinfo*, int);
+Stream	*streamnew(ushort, ushort, ushort, Qinfo*, int);
 void	streamopen(Chan*, Qinfo*);
 int	streamparse(char*, Block*);
 void	streamstat(Chan*, char*, char*);
@@ -206,7 +206,7 @@ void	userinit(void);
 void	validaddr(ulong, ulong, int);
 void	vecinit(void);
 void	vector80(void);
-void*	vmemchr(void*, int, int);
+void	*vmemchr(void*, int, int);
 void	vmereset(void);
 void	wakeme(Alarm*);
 void	wakeup(Rendez*);
diff --git a/ss/fns.h b/ss/fns.h
index 4cc39c7a2a80d28ee46d3fa109105cd2335c5da5..e6982c5263a9520710e62a1e56de5cbad015c5ca 100644
--- a/ss/fns.h
+++ b/ss/fns.h
@@ -132,7 +132,7 @@ void	newqinfo(Qinfo*);
 char	*nextelem(char*, char*);
 int	nonetcksum(Block*, int);
 void	nonetfreeifc(Noifc*);
-Noifc*	nonetnewifc(Queue*, Stream*, int, int, int, void (*)(Noconv*, char*));
+Noifc	*nonetnewifc(Queue*, Stream*, int, int, int, void (*)(Noconv*, char*));
 void	nonetrcvmsg(Noconv*, Block*);
 void	nonettoggle(void);
 void	notify(Ureg*);