From 7958c62b63f02f8d3bd3f424aab1d08f4b2e70ef Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sun, 3 Jan 1993 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1993-01-03

---
 pc/devvga.c   | 4 ++--
 port/devbit.c | 3 +++
 port/swap.c   | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pc/devvga.c b/pc/devvga.c
index 1b593a3e65e9ff862471a1eecfbbae35197ab32a..1685f989657ec161e27656abb5dbe13fe3d3ecb2 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -476,7 +476,7 @@ void
 setscreen(int maxx, int maxy, int ldepth)
 {
 	int len, vgamaxy, width, i, x, s;
-	uchar *p, *oldp;
+	ulong *p, *oldp;
 
 	if(ldepth == 3)
 		setmode(&mode13);
@@ -518,7 +518,7 @@ setscreen(int maxx, int maxy, int ldepth)
 	gscreen.r.min = Pt(0, 0);
 	gscreen.r.max = Pt(maxx, maxy);
 	gscreen.clipr = gscreen.r;
-	gscreen.base = (ulong*)p;
+	gscreen.base = p;
 	splx(s);
 	if(oldp)
 		xfree(oldp);
diff --git a/port/devbit.c b/port/devbit.c
index 795a89cc5ee00902a149bc28231452b619174fc2..600494713ff1295d331f0d5de52154c9a2355c1f 100644
--- a/port/devbit.c
+++ b/port/devbit.c
@@ -932,6 +932,9 @@ bitwrite(Chan *c, void *va, long n, ulong offset)
 			/*
 			 * cursorswitch
 			 *	'c'		1
+			 * if one more byte, says whether to disable
+			 * because of stupid lcd's (thank you bart)
+			 * else
 			 * nothing more: return to arrow; else
 			 * 	Point		8
 			 *	clr		32
diff --git a/port/swap.c b/port/swap.c
index 56326ad37da15127496b04829f5691b4109ab530..269d8544b39c54aa0f133cc4030dc742ba638e58 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -19,7 +19,7 @@ enum
 
 	Image 	swapimage;
 static 	int	swopen;
-static	Page	*iolist[Maxpages];
+static	Page	**iolist;
 static	int	ioptr;
 
 void
@@ -30,6 +30,9 @@ swapinit(void)
 	swapalloc.alloc = swapalloc.swmap;
 	swapalloc.last = swapalloc.swmap;
 	swapalloc.free = conf.nswap;
+	iolist = xalloc(Maxpages*sizeof(Page*));
+	if(swapalloc.swmap == 0 || iolist == 0)
+		panic("swapinit: not enough memory");
 }
 
 ulong