From e6c43b3ea22365ca0a82e0c81fd0481d021f66ca Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 15 Aug 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-08-15

---
 pc/devvga.c    | 16 ++++++++--------
 port/devcons.c |  3 ++-
 port/swap.c    | 26 +++++++++++++-------------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pc/devvga.c b/pc/devvga.c
index ddc32236cc6299a973b42c60a609803cf18b2f1c..e6d96f3a65b031222ebee4226c6ab649623030c1 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -734,7 +734,7 @@ screenload(Rectangle r, uchar *data, int tl, int l, int dolock)
 
 	if(dolock && hwgc == 0)
 		cursorlock(r);
-	ilock(&palettelock);
+	lock(&palettelock);
 
 	q = byteaddr(&gscreen, r.min);
 	mx = 7>>gscreen.ldepth;
@@ -814,7 +814,7 @@ screenload(Rectangle r, uchar *data, int tl, int l, int dolock)
 		data += l;
 	}
 
-	iunlock(&palettelock);
+	unlock(&palettelock);
 	if(dolock && hwgc == 0)
 		cursorunlock();
 }
@@ -891,7 +891,7 @@ screenunload(Rectangle r, uchar *data, int tl, int l, int dolock)
 
 	if(dolock && hwgc == 0)
 		cursorlock(r);
-	ilock(&palettelock);
+	lock(&palettelock);
 
 	q = byteaddr(&gscreen, r.min);
 	mx = 7>>gscreen.ldepth;
@@ -971,7 +971,7 @@ screenunload(Rectangle r, uchar *data, int tl, int l, int dolock)
 		data += l;
 	}
 
-	iunlock(&palettelock);
+	unlock(&palettelock);
 	if(dolock && hwgc == 0)
 		cursorunlock();
 }
@@ -1165,11 +1165,11 @@ getcolor(ulong p, ulong *pr, ulong *pg, ulong *pb)
 	}
 	p &= x;
 	p ^= x;
-	ilock(&palettelock);
+	lock(&palettelock);
 	*pr = colormap[p][Pred];
 	*pg = colormap[p][Pgreen];
 	*pb = colormap[p][Pblue];
-	iunlock(&palettelock);
+	unlock(&palettelock);
 }
 
 int
@@ -1187,7 +1187,7 @@ setcolor(ulong p, ulong r, ulong g, ulong b)
 	}
 	p &= x;
 	p ^= x;
-	ilock(&palettelock);
+	lock(&palettelock);
 	colormap[p][Pred] = r;
 	colormap[p][Pgreen] = g;
 	colormap[p][Pblue] = b;
@@ -1195,7 +1195,7 @@ setcolor(ulong p, ulong r, ulong g, ulong b)
 	vgao(Pdata, r>>(32-6));
 	vgao(Pdata, g>>(32-6));
 	vgao(Pdata, b>>(32-6));
-	iunlock(&palettelock);
+	unlock(&palettelock);
 	return ~0;
 }
 
diff --git a/port/devcons.c b/port/devcons.c
index decd8ac53385d4da350277641395a149dae03f06..455a731e4c31383c47b09ecea8ddfaf44753c714 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -21,7 +21,7 @@ static struct
 	int	x;		/* index into line */
 	char	line[1024];	/* current input line */
 
-	char	c;
+	Rune	c;
 	int	count;
 	int	repeat;
 	int	ctlpoff;
@@ -276,6 +276,7 @@ kbdputc(Queue*, int ch)
 	if(n == 0)
 		return 0;
 	echo(r, buf, n);
+	kbd.c = r;
 	qproduce(kbdq, buf, n);
 	return 0;
 }
diff --git a/port/swap.c b/port/swap.c
index 210d2b7e2fa4331bc0f34271f7f4fc2a47e40a17..3708278a63304280759194d59bc1c1b9f0f2eb6e 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -5,12 +5,12 @@
 #include	"fns.h"
 #include	"../port/error.h"
 
-int	canflush(Proc *p, Segment*);
-void	executeio(void);
-int	needpages(void*);
-void	pageout(Proc *p, Segment*);
-void	pagepte(int, Page**);
-void	pager(void*);
+static int	canflush(Proc*, Segment*);
+static void	executeio(void);
+static int	needpages(void*);
+static void	pageout(Proc*, Segment*);
+static void	pagepte(int, Page**);
+static void	pager(void*);
 
 enum
 {
@@ -93,7 +93,7 @@ kickpager(void)
 	}
 }
 
-void
+static void
 pager(void *junk)
 {
 	int i;
@@ -159,7 +159,7 @@ loop:
 	goto loop;
 }
 
-void			
+static void			
 pageout(Proc *p, Segment *s)
 {
 	int type, i;
@@ -214,7 +214,7 @@ out:
 	putseg(s);
 }
 
-int
+static int
 canflush(Proc *p, Segment *s)
 {
 	int i;
@@ -230,7 +230,7 @@ canflush(Proc *p, Segment *s)
 	unlock(s);
 
 	/* Now we must do hardwork to ensure all processes which have tlb
-	 * entries for this segment will be flushed if we suceed in pageing it out
+	 * entries for this segment will be flushed if we succeed in paging it out
 	 */
 	p = proctab(0);
 	ep = &p[conf.nproc];
@@ -246,7 +246,7 @@ canflush(Proc *p, Segment *s)
 	return 1;						
 }
 
-void
+static void
 pagepte(int type, Page **pg)
 {
 	ulong daddr;
@@ -284,7 +284,7 @@ pagepte(int type, Page **pg)
 	}
 }
 
-void
+static void
 executeio(void)
 {
 	Page *out;
@@ -319,7 +319,7 @@ executeio(void)
 	ioptr = 0;
 }
 
-int
+static int
 needpages(void*)
 {
 	return palloc.freecount < swapalloc.headroom;