From 675c62993a020b8f29846973cec7839093121234 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 5 Nov 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-11-05

---
 pc/dat.h          |  6 +++---
 pc/screen.h       |  5 -----
 pc/vga.c          | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 power/faultmips.c |  4 ++--
 power/trap.c      |  8 ++++----
 ss/main.c         |  7 ++++---
 6 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/pc/dat.h b/pc/dat.h
index 2dbf95e5279a0ecd5c292d019680cf3b92c8ef91..5f35aedd73a15c0cae5c79260b6919dcb2b99787 100644
--- a/pc/dat.h
+++ b/pc/dat.h
@@ -76,12 +76,12 @@ struct Conf
 	ulong	base0;		/* base of bank 0 */
 	ulong	base1;		/* base of bank 1 */
 	ulong	copymode;	/* 0 is copy on write, 1 is copy on reference */
-	ulong	ipif;		/* Ip protocol interfaces */
-	ulong	ip;		/* Ip conversations per interface */
 	ulong	arp;		/* Arp table size */
-	ulong	frag;		/* Ip fragment assemble queue size */
 	ulong	nfloppy;	/* number of floppy drives */
 	ulong	nhard;		/* number of hard drives */
+	ulong	ldepth;		/* screen depth */
+	ulong	maxx;		/* screen width */
+	ulong	maxy;		/* screen length */
 };
 
 /*
diff --git a/pc/screen.h b/pc/screen.h
index 04fd048b804c96347861a49ecae322422183ad7f..a3dd699a525856e050fc5a74688ba926b93df537 100644
--- a/pc/screen.h
+++ b/pc/screen.h
@@ -29,8 +29,3 @@ extern Cursorinfo	cursor;
 extern void		mouseupdate(int);
 
 #define	hwscreenwrite(a, b)
-
-#define mbbpt(x)
-#define mbbrect(x)
-#define screenupdate()
-#define mousescreenupdate()
diff --git a/pc/vga.c b/pc/vga.c
index 00a51b2e74d3d223db1052c610faf3db45798f33..c8a5c80e5ee20499caeb9045ac7f92303a6885b4 100644
--- a/pc/vga.c
+++ b/pc/vga.c
@@ -381,3 +381,49 @@ bigcursor(void)
 
 	memmove(&arrow, &fatarrow, sizeof(fatarrow));
 }
+
+/*
+ *  collect changes to the 'soft' screen
+ */
+static Rectangle mbb;
+
+void
+mbbrect(Rectangle r)
+{
+	if(!islcd)
+		return;
+	if (r.min.x < mbb.min.x)
+		mbb.min.x = r.min.x;
+	if (r.min.y < mbb.min.y)
+		mbb.min.y = r.min.y;
+	if (r.max.x > mbb.max.x)
+		mbb.max.x = r.max.x;
+	if (r.max.y > mbb.max.y)
+		mbb.max.y = r.max.y;
+}
+
+void
+mbbpt(Point p)
+{
+	if(!islcd)
+		return;
+	if (p.x < mbb.min.x)
+		mbb.min.x = p.x;
+	if (p.y < mbb.min.y)
+		mbb.min.y = p.y;
+	if (p.x >= mbb.max.x)
+		mbb.max.x = p.x+1;
+	if (p.y >= mbb.max.y)
+		mbb.max.y = p.y+1;
+}
+
+void
+screenupdate(void)
+{
+}
+
+void
+mousescreenupdate(void)
+{
+}
+
diff --git a/power/faultmips.c b/power/faultmips.c
index 49327ba4d89b6fdc3673623db714446bed53b5ea..6aa767cad73a8d6bcd2187e99937847ef7f1ea20 100644
--- a/power/faultmips.c
+++ b/power/faultmips.c
@@ -34,8 +34,8 @@ faultmips(Ureg *ur, int user, int code)
 			LEDOFF(LEDfault);
 			return;
 		}
-		print("kernel %s badvaddr=0x%lux\n", excname[code], ur->badvaddr);
-		print("status=0x%lux pc=0x%lux sp=0x%lux\n", ur->status, ur->pc, ur->sp);
+		iprint("kernel %s badvaddr=0x%lux\n", excname[code], ur->badvaddr);
+		iprint("status=0x%lux pc=0x%lux sp=0x%lux\n", ur->status, ur->pc, ur->sp);
 		dumpregs(ur);
 		panic("fault");
 	}
diff --git a/power/trap.c b/power/trap.c
index 46f9e25655147de4084ec78794d3679da846b0a7..155a8409d0804f917218f67e02b95d86ec9493df 100644
--- a/power/trap.c
+++ b/power/trap.c
@@ -375,13 +375,13 @@ dumpregs(Ureg *ur)
 	ulong *l;
 
 	if(u)
-		print("registers for %s %d\n", u->p->text, u->p->pid);
+		iprint("registers for %s %d\n", u->p->text, u->p->pid);
 	else
-		print("registers for kernel\n");
+		iprint("registers for kernel\n");
 	l = &ur->status;
 	for(i=0; i<sizeof regname/sizeof(char*); i+=2, l+=2){
-		print("%s\t%.8lux\t%s\t%.8lux\n", regname[i], l[0], regname[i+1], l[1]);
-		prflush();
+		iprint("%s\t%.8lux\t%s\t%.8lux\n", regname[i], l[0], regname[i+1], l[1]);
+/*		prflush();/**/
 	}
 }
 
diff --git a/ss/main.c b/ss/main.c
index 053a221ac5c96fcc95c0dd8e17e2a10c218bae75..bf9ddac314fb7c535c8e19ab616682a1788a85ff 100644
--- a/ss/main.c
+++ b/ss/main.c
@@ -448,9 +448,10 @@ confinit(void)
 		bank[1] = bank[0]-8;
 		bank[0] = 8;
 	}
-
 	conf.npage = conf.npage0+conf.npage1;
-	conf.upages = (conf.npage*70)/100;
+	i = screenbits()-1;		/* Calculate % of memory for page pool */
+	i = 70 - (i*10);
+	conf.upages = (conf.npage*i)/100;
 	if(cpuserver){
 		i = conf.npage-conf.upages;
 		if(i > (12*MB)/BY2PG)
@@ -473,7 +474,7 @@ confinit(void)
 	if(cpuserver)
 		conf.nswap = conf.npage*2;
 	else
-		conf.nswap = 4096;
+		conf.nswap = 16*MB/BY2PG;
 	conf.nimage = 50;
 	conf.copymode = 0;		/* copy on write */
 	conf.ipif = 8;