From 6230241dc39e9922df9ec74a0e4932f854eb13d2 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 13 Oct 1999 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1999-10-13

---
 carrera/screen.c |  6 +++---
 pc/screen.c      |  3 +--
 port/devdraw.c   | 10 +++-------
 port/portfns.h   |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/carrera/screen.c b/carrera/screen.c
index 32d1a97f662269c3ff0f4403f7abbdea07b48930..e910161c95e733170cfba2019a3bf586807b7974 100644
--- a/carrera/screen.c
+++ b/carrera/screen.c
@@ -193,7 +193,7 @@ dacinit(void)
 	for(i = 0; i < 0x400; i++)
 		d->cr2 = 0xff;
 
-	drawcmap(1);
+	drawcmap();
 
 	/* Overlay Palette Ram */
 	d->cr0 = 0x00;
@@ -418,7 +418,7 @@ getcolor(ulong p, ulong *pr, ulong *pg, ulong *pb)
 	/* to protect DAC from mouse movement */
 	lock(&cursor);
 
-	d->cr0 = revtab0[255 - (p & 0xFF)];
+	d->cr0 = revtab0[p & 0xFF];
 	d->cr1 = 0;
 	r = d->cr3;
 	g = d->cr3;
@@ -441,7 +441,7 @@ setcolor(ulong p, ulong r, ulong g, ulong b)
 	/* to protect DAC from mouse movement */
 	lock(&cursor);
 
-	d->cr0 = revtab0[255 - (p & 0xFF)];
+	d->cr0 = revtab0[p & 0xFF];
 	d->cr1 = 0;
 	d->cr3 = r >> 24;
 	d->cr3 = g >> 24;
diff --git a/pc/screen.c b/pc/screen.c
index 710e620e7d5748521a0eb634dd9f92ff73d76706..42376d0830ecb8d036eefbb619b5744c11ef22ae 100644
--- a/pc/screen.c
+++ b/pc/screen.c
@@ -82,7 +82,7 @@ screensize(int x, int y, int z, ulong chan)
 
 	physgscreenr = gscreen->r;
 
-	drawcmap(1);
+	drawcmap();
 	return 0;
 }
 
@@ -288,7 +288,6 @@ setcolor(ulong p, ulong r, ulong g, ulong b)
 		return 0;
 	}
 	p &= x;
-	p ^= x;
 
 	return setpalette(p, r, g, b);
 }
diff --git a/port/devdraw.c b/port/devdraw.c
index fe9ded205bb08710271e79216f5ded0ac5934f30..2b95cbd462b7016c6acd7c8facb13bb3e2e0c31d 100644
--- a/port/devdraw.c
+++ b/port/devdraw.c
@@ -1928,7 +1928,7 @@ Dev drawdevtab = {
  * On 8 bit displays, load the default color map
  */
 void
-drawcmap(int invert)
+drawcmap(void)
 {
 	int r, g, b, cr, cg, cb, v;
 	int num, den;
@@ -1952,12 +1952,8 @@ drawcmap(int invert)
 				cg = g*num/den;
 				cb = b*num/den;
 			}
-			if(invert)
-				setcolor(255-i-(j&15),
-					cr*0x01010101, cg*0x01010101, cb*0x01010101);
-			else
-				setcolor(i+(j&15),
-					cr*0x01010101, cg*0x01010101, cb*0x01010101);
+			setcolor(i+(j&15),
+				cr*0x01010101, cg*0x01010101, cb*0x01010101);
 		    }
 	}
 }
diff --git a/port/portfns.h b/port/portfns.h
index 7fd92de10a7a66504ef14aeb2add76c3b1b8582f..5e11f1842020c8c9247e215590d060bdab960437 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -81,7 +81,7 @@ int		devwalk(Chan*, char*, Dirtab*, int, Devgen*);
 void		devwstat(Chan*, char*);
 Chan*		domount(Chan*);
 void		drawactive(int);
-void		drawcmap(int);
+void		drawcmap(void);
 void		dumpaproc(Proc*);
 void		dumpqueues(void);
 void		dumpregs(Ureg*);