From 2efa7364affae95f74459274a1ade99419b4fa68 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 28 Dec 1993 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1993-12-28

---
 carrera/faultmips.c |  2 ++
 carrera/mmu.c       |  3 +--
 carrera/screen.c    | 10 +++++-----
 port/devcons.c      |  5 -----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/carrera/faultmips.c b/carrera/faultmips.c
index 55edef0d93019a88a5911e28b4ff1080e8d25899..3b83a962d958c35cc979c220fad2c42827b12284 100644
--- a/carrera/faultmips.c
+++ b/carrera/faultmips.c
@@ -7,6 +7,8 @@
 #include	"../port/error.h"
 #include	"io.h"
 
+static int iwf;
+
 /*
  * Ask if the instruction at EPC could have cause this badvaddr
  */
diff --git a/carrera/mmu.c b/carrera/mmu.c
index 0599b90e6f9df07004bd1d03dbb3fdc5af541190..534fb365dc09a18d40f2cf4c5773acfc251282a9 100644
--- a/carrera/mmu.c
+++ b/carrera/mmu.c
@@ -285,8 +285,7 @@ putmmu(ulong tlbvirt, ulong tlbphys, Page *pg)
 	ctl = &pg->cachectl[m->machno];
 	switch(*ctl) {
 	case PG_TXTFLUSH:
-cleancache();		/* Too expensive */
-/*		icflush((void*)pg->va, BY2PG);*/
+		icflush((void*)pg->va, BY2PG);
 		*ctl = PG_NOFLUSH;
 		break;
 	case PG_DATFLUSH:
diff --git a/carrera/screen.c b/carrera/screen.c
index 0c839b15d92e3903f42174655254f1925542ba6f..672ef9043dbb4304d988e368ca43d2b6b86a8ef0 100644
--- a/carrera/screen.c
+++ b/carrera/screen.c
@@ -82,10 +82,9 @@ VGAmode dfltmode =
 	0x0a, 0x00, 0x43, 0x1f, 
 };
 
+	Lock		screenlock;
+	GSubfont*	defont;
 extern	GSubfont	defont0;
-GSubfont		*defont;
-
-Lock	screenlock;
 
 GBitmap	gscreen =
 {
@@ -157,6 +156,7 @@ x3to32(uchar x)
 	y = (x<<(32-6))|(x<<(32-12))|(x<<(32-18))|(x<<(32-24))|(x<<(32-30));
 	return y;
 }
+
 static ulong
 x6to32(uchar x)
 {
@@ -183,7 +183,6 @@ screeninit(void)
 
 	/* allocate a new soft bitmap area */
 	gscreen.base = xalloc(1024*1024);
-
 	gbitblt(&gscreen, Pt(0, 0), &gscreen, gscreen.r, 0);
 
 	screenwin();
@@ -547,7 +546,8 @@ extern	cursorlock(Rectangle);
 extern	cursorunlock(void);
 /*
  * paste tile into screen.
- * tile is at location r, first pixel in *data.  tl is length of scan line to insert,
+ * tile is at location r, first pixel in *data. 
+ * tl is length of scan line to insert,
  * l is amount to advance data after each scan line.
  */
 void
diff --git a/port/devcons.c b/port/devcons.c
index 7456badfc5f420b8e4c64295d651bd33e477d69b..a6f9ce82e89644d83bbb33f5adfb73a9f062df0f 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -341,7 +341,6 @@ enum{
 	Qlights,
 	Qmsec,
 	Qnoise,
-	Qnoteid,
 	Qnull,
 	Qpgrpid,
 	Qpid,
@@ -369,7 +368,6 @@ Dirtab consdir[]={
 	"lights",	{Qlights},	0,		0220,
 	"msec",		{Qmsec},	NUMSIZE,	0444,
 	"noise",	{Qnoise},	0,		0220,
-	"noteid",	{Qnoteid},	NUMSIZE,	0444,
 	"null",		{Qnull},	0,		0666,
 	"pgrpid",	{Qpgrpid},	NUMSIZE,	0444,
 	"pid",		{Qpid},		NUMSIZE,	0444,
@@ -577,9 +575,6 @@ consread(Chan *c, void *buf, long n, ulong offset)
 	case Qpgrpid:
 		return readnum(offset, buf, n, up->pgrp->pgrpid, NUMSIZE);
 
-	case Qnoteid:
-		return readnum(offset, buf, n, up->noteid, NUMSIZE);
-
 	case Qpid:
 		return readnum(offset, buf, n, up->pid, NUMSIZE);