3 files changed, 9 insertions(+), 3 deletions(-)

M pc/devvga.c
M port/devbit.c
M port/swap.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);

@@ 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

@@ 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