2 files changed, 11 insertions(+), 22 deletions(-)

M carrera/screen.c
M pc/devvga.c

@@ 169,13 169,13 @@ dacinit(void)
 		d->cr2 = 0xff;
 
 	for(i = 0; i<256; i++) {
-		r = ~rep((i>>5) & 7, 3);
-		g = ~rep((i>>2) & 7, 3);
-		b = ~rep(i & 3, 2);
+		r = rep((i>>5) & 7, 3);
+		g = rep((i>>2) & 7, 3);
+		b = rep(i & 3, 2);
 		setcolor(i, r, g, b);
 	}
-	setcolor(85, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA);
-	setcolor(170, 0x55555555, 0x55555555, 0x55555555);
+	setcolor(170, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA);
+	setcolor(85, 0x55555555, 0x55555555, 0x55555555);
 
 	/* Overlay Palette Ram */
 	d->cr0 = 0x00;


@@ 199,9 199,6 @@ dacinit(void)
 void
 screeninit(void)
 {
-	int i;
-	ulong r, g, b;
-
 	dacinit();
 
 	bitblt(&gscreen, Pt(0, 0), &gscreen, gscreen.r, 0);


@@ 209,15 206,6 @@ screeninit(void)
 	out.pos.y = 0;
 	out.bwid = defont0.info[' '].width;
 
-	for(i = 0; i<256; i++) {
-		r = ~rep((i>>5) & 7, 3);
-		g = ~rep((i>>2) & 7, 3);
-		b = ~rep(i & 3, 2);
-		setcolor(i, r, g, b);
-	}
-	setcolor(85, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA);
-	setcolor(170, 0x55555555, 0x55555555, 0x55555555);
-
 	screenwin();
 }
 


@@ 348,7 336,7 @@ getcolor(ulong p, ulong *pr, ulong *pg, ulong *pb)
 
 	d = DAC;
 
-	d->cr0 = revtab0[p & 0xFF];
+	d->cr0 = revtab0[255 - (p & 0xFF)];
 	d->cr1 = 0;
 	r = d->cr3;
 	g = d->cr3;


@@ 366,7 354,7 @@ setcolor(ulong p, ulong r, ulong g, ulong b)
 
 	d = DAC;
 
-	d->cr0 = revtab0[p & 0xFF];
+	d->cr0 = revtab0[255 - (p & 0xFF)];
 	d->cr1 = 0;
 	d->cr3 = r >> 24;
 	d->cr3 = g >> 24;

@@ 58,7 58,7 @@ struct Vgacard
 	void	(*setpage)(int);	/* routine to page though display memory */
 };
 
-static void	nopage(int), tsengpage(int), tridentpage(int);
+static void	nopage(int), et4000page(int), tridentpage(int);
 static void	atipage(int), cirruspage(int);
 extern void	s3page(int);
 


@@ 71,7 71,8 @@ Vgacard vgachips[] =
 	{ "pvga1a", cirruspage, },
 	{ "s3", s3page, },
 	{ "trident", tridentpage, },
-	{ "tseng", tsengpage, },
+	{ "et4000", et4000page, },
+	{ "tseng", et4000page, },
 	{ 0, 0, },
 };
 


@@ 1105,7 1106,7 @@ tridentpage(int page)
 	vgaxo(Seqx, 0x0E, seq0E|(page^0x02));
 }
 static void
-tsengpage(int page)
+et4000page(int page)
 {
 	outb(0x3cd, (page<<4)|page);
 }