4 files changed, 8 insertions(+), 13 deletions(-)

M carrera/screen.c
M pc/screen.c
M port/devdraw.c
M port/portfns.h

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

@@ 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);
 }

@@ 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);
 		    }
 	}
 }

@@ 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*);