From 783faecb65629eb56d601b9ba30d6c1d843324b7 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 2 Nov 1999 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1999-11-02

---
 pc/vgamach64xx.c |  1 +
 port/devdraw.c   | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pc/vgamach64xx.c b/pc/vgamach64xx.c
index 33694d16da12ed97fc5e36920e81b9ac868b9672..cd0f95674312f83398eb099beda45ea188aeafe5 100644
--- a/pc/vgamach64xx.c
+++ b/pc/vgamach64xx.c
@@ -27,6 +27,7 @@ static ushort mach64xxdid[] = {
 	('G'<<8)|'U',
 	('V'<<8)|'T',
 	('V'<<8)|'U',
+	('L'<<8)|'I',
 	('L'<<8)|'P',
 	0,
 };
diff --git a/port/devdraw.c b/port/devdraw.c
index 3498c7a7b4e87ecad6975a3c2b6249399f510ff2..9dc022356d50074c51ce3688c7412405e1d16b2e 100644
--- a/port/devdraw.c
+++ b/port/devdraw.c
@@ -1203,13 +1203,13 @@ drawcoord(uchar *p, uchar *maxp, int oldx, int *newx)
 }
 
 static void
-printmesg(char *fmt, uchar *a, int itwouldmakemehappyifyouprintthis)
+printmesg(char *fmt, uchar *a, int plsprnt)
 {
 	char buf[256];
 	char *p, *q;
 	int s;
 
-	if(1|| itwouldmakemehappyifyouprintthis==0){
+	if(1|| plsprnt==0){
 		SET(s,q,p);
 		USED(fmt, a, buf, p, q, s);
 		return;
@@ -1813,7 +1813,7 @@ drawmesg(Client *client, void *av, int n)
 			dstflush(dstid, dst, Rect(p.x, p.y, q.x, p.y+Dy(font->image->r)));
 			continue;
 
-		/* use public screen: 'S' id[4] ldepth[4] */
+		/* use public screen: 'S' id[4] chan[4] */
 		case 'S':
 			printmesg(fmt="Ll", a, 0);
 			m = 1+4+4;
@@ -1825,8 +1825,8 @@ drawmesg(Client *client, void *av, int n)
 			dscrn = drawlookupdscreen(dstid);
 			if(dscrn==0 || (dscrn->public==0 && dscrn->owner!=client))
 				error(Enodrawscreen);
-			if(dscrn->screen->image->depth != (1<<BGLONG(a+5)))
-				error("inconsistent depth");
+			if(dscrn->screen->image->chan != BGLONG(a+5))
+				error("inconsistent chan");
 			if(drawinstallscreen(client, dscrn, 0, 0, 0, 0) == 0)
 				error(Edrawmem);
 			continue;