From 718b666aa4b7838364fd434075cafde9ca1bdc8f Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sun, 13 Apr 1997 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1997-04-13

---
 pc/fns.h       |  1 -
 port/devcons.c | 20 ++++++++++----------
 port/portfns.h |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pc/fns.h b/pc/fns.h
index 8f7101caa41b42ff8fc83088ebded20735e88ae3..2e747514ac0e4358b1e7b3aab550a663123b0faa 100644
--- a/pc/fns.h
+++ b/pc/fns.h
@@ -1,7 +1,6 @@
 #include "../port/portfns.h"
 
 void	aamloop(int);
-void	addclock0link(void (*)(void));
 void	addconf(char*, char*);
 void	addscsilink(char*, Scsiio (*)(int, ISAConf*));
 void	archinit(void);
diff --git a/port/devcons.c b/port/devcons.c
index 2fd45a16fee655f5c69c0770ba59ed5dcb075de6..728bd4e8067bee559c63af21f1f619b4a4049cb4 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -925,19 +925,10 @@ genrandom(void*)
 	}
 }
 
-static void
-randominit(void)
-{
-	addclock0link(randomclock);
-	rb.ep = rb.buf + sizeof(rb.buf);
-	rb.rp = rb.wp = rb.buf;
-	kproc("genrandom", genrandom, 0);
-}
-
 /*
  *  produce random bits in a circular buffer
  */
-void
+static void
 randomclock(void)
 {
 	if(rb.randomcount == 0 || !rbnotfull(0))
@@ -961,6 +952,15 @@ randomclock(void)
 		wakeup(&rb.consumer);
 }
 
+static void
+randominit(void)
+{
+	addclock0link(randomclock);
+	rb.ep = rb.buf + sizeof(rb.buf);
+	rb.rp = rb.wp = rb.buf;
+	kproc("genrandom", genrandom, 0);
+}
+
 /*
  *  consume random bytes from a circular buffer
  */
diff --git a/port/portfns.h b/port/portfns.h
index 9ecdd727025a6dfaad12ffba1c70765da934eea5..50d7bdbe7ae6ca894744e493fd38e53b029b53ca 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -1,4 +1,5 @@
 void		accounttime(void);
+void		addclock0link(void (*)(void));
 void		addrootfile(char*, uchar*, ulong);
 void		alarmkproc(void*);
 Block*		allocb(int);
@@ -53,8 +54,6 @@ ulong		dbgpc(Proc*);
 int		decref(Ref*);
 int		decrypt(void*, void*, int);
 void		delay(int);
-void		devreset(void);
-void		devinit(void);
 Chan*		devattach(int, char*);
 Block*		devbread(Chan*, long, ulong);
 long		devbwrite(Chan*, Block*, ulong);
@@ -63,9 +62,11 @@ void		devcreate(Chan*, char*, int, ulong);
 void		devdir(Chan*, Qid, char*, long, char*, long, Dir*);
 long		devdirread(Chan*, char*, long, Dirtab*, int, Devgen*);
 Devgen		devgen;
+void		devinit(void);
 int		devno(int, int);
 Chan*		devopen(Chan*, int, Dirtab*, int, Devgen*);
 void		devremove(Chan*);
+void		devreset(void);
 void		devstat(Chan*, char*, Dirtab*, int, Devgen*);
 int		devwalk(Chan*, char*, Dirtab*, int, Devgen*);
 void		devwstat(Chan*, char*);
@@ -229,7 +230,6 @@ int		qwindow(Queue*);
 int		qwrite(Queue*, void*, int);
 void		qsetlimit(Queue*, int);
 void		qnoblock(Queue*, int);
-void		randomclock(void);
 int		readnum(ulong, char*, ulong, ulong, int);
 int		readstr(ulong, char*, ulong, char*);
 void		ready(Proc*);