5 files changed, 15 insertions(+), 33 deletions(-)

M carrera/screen.c
M pc/devata.c
M pc/devvga.c
M pc/vgaark2000pv.c
M port/portfns.h

@@ 145,7 145,6 @@ dacinit(void)
 {
 	Dac *d;
 	int i;
-	ulong r, g, b;
 
 	d = DAC;
 


@@ 168,14 167,7 @@ dacinit(void)
 	for(i = 0; i < 0x400; i++)
 		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);
-		setcolor(i, r, g, b);
-	}
-	setcolor(170, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA);
-	setcolor(85, 0x55555555, 0x55555555, 0x55555555);
+	graphicscmap(0);
 
 	/* Overlay Palette Ram */
 	d->cr0 = 0x00;

@@ 401,7 401,7 @@ atactlrprobe(int ctlrno, int irq)
 		outb(port+Pctrl, Srst|nIEN);
 		delay(10);
 		outb(port+Pctrl, 0);
-		if(atactlrwait(ctlr, DHmagic, 0, MS2TK(20)){
+		if(atactlrwait(ctlr, DHmagic, 0, MS2TK(20))){
 			DPRINT("ata%d: Srst status %ux/%ux/%ux\n", ctlrno,
 				inb(port+Pstatus), inb(port+Pcylmsb), inb(port+Pcyllsb));
 			xfree(ctlr);

@@ 626,11 626,7 @@ setscreen(int maxx, int maxy, int ldepth)
 	/* default color map (has to be outside the lock) */
 	switch(ldepth){
 	case 3:
-		for(i = 0; i < Pcolours; i++)
-			setcolor(i, xnto32(i>>5, 3), xnto32(i>>2, 3), xnto32(i, 2));
-		setcolor(0x55, xnto32(0x15, 6), xnto32(0x15, 6), xnto32(0x15, 6));
-		setcolor(0xaa, xnto32(0x2a, 6), xnto32(0x2a, 6), xnto32(0x2a, 6));
-		setcolor(0xff, xnto32(0x3f, 6), xnto32(0x3f, 6), xnto32(0x3f, 6));
+		graphicscmap(0);
 		break;
 	case 2:
 	case 1:

@@ 39,12 39,12 @@ enable(void)
 
 	/*
 	 * Disable the cursor then configure for X-Windows style,
-	 * 64x64 and 4/8-bit colour depth.
+	 * 32x32 and 4/8-bit colour depth.
 	 * Set cursor colours for 4/8-bit.
 	 */
 	seq20 = vgaxi(Seqx, 0x20) & ~0x1F;
 	vgaxo(Seqx, 0x20, seq20);
-	seq20 |= 0x1C;
+	seq20 |= 0x18;
 
 	vgaxo(Seqx, 0x26, Pwhite);
 	vgaxo(Seqx, 0x27, Pwhite);


@@ 54,13 54,13 @@ enable(void)
 	vgaxo(Seqx, 0x2B, Pblack);
 
 	/*
-	 * Cursor storage is a 1Kb block located in the last 16Kb
-	 * of video memory. Crt25 is the index of which 1Kb block.
+	 * Cursor storage is a 256 byte or 1Kb block located in the last
+	 * 16Kb of video memory. Crt25 is the index of which block.
 	 */
 	storage = (vgaxi(Seqx, 0x10)>>6) & 0x03;
 	storage = (1024*1024)<<storage;
-	storage -= 1024;
-	vgaxo(Seqx, 0x25, 0x3C);
+	storage -= 256;
+	vgaxo(Seqx, 0x25, 0x3F);
 
 	/*
 	 * Enable the cursor.


@@ 71,7 71,7 @@ enable(void)
 static void
 load(Cursor *c)
 {
-	uchar *p, seq20;
+	uchar *p;
 	int x, y;
 
 	/*


@@ 81,17 81,13 @@ load(Cursor *c)
 	 * just make sure it's enabled.
 	 */
 	lock(&ark2000pvlock);
-	seq20 = vgaxi(Seqx, 0x20);
 	if(memcmp(c, &curcursor, sizeof(Cursor)) == 0){
-		vgaxo(Seqx, 0x20, seq20|0x08);
+		vgaxo(Seqx, 0x20, vgaxi(Seqx, 0x20)|0x08);
 		unlock(&ark2000pvlock);
 		return;
 	}
 	memmove(&curcursor, c, sizeof(Cursor));
 
-#ifdef notdef
-	vgaxo(Seqx, 0x20, seq20 & ~0x08);
-#endif
 	/*
 	 * Is linear addressing turned on? This will determine
 	 * how we access the cursor storage.


@@ 111,12 107,12 @@ load(Cursor *c)
 	 *	 0   1	underlying pixel colour
 	 *	 1   0	background colour
 	 *	 1   1	foreground colour
-	 * Put the cursor into the top-left of the 64x64 array.
+	 * Put the cursor into the top-left of the 32x32 array.
 	 * The manual doesn't say what the data layout in memory is -
 	 * this worked out by trial and error.
 	 */
-	for(y = 0; y < 64; y++){
-		for(x = 0; x < 64/8; x++){
+	for(y = 0; y < 32; y++){
+		for(x = 0; x < 32/8; x++){
 			if(x < 16/8 && y < 16){
 				*p++ = c->clr[2*y + x]|c->set[2*y + x];
 				*p++ = c->set[2*y + x];


@@ 132,9 128,6 @@ load(Cursor *c)
 	 * Set the cursor hotpoint and enable the cursor.
 	 */
 	hotpoint = c->offset;
-#ifdef notdef
-	vgaxo(Seqx, 0x20, seq20|0x08);
-#endif
 
 	unlock(&ark2000pvlock);
 }

@@ 94,6 94,7 @@ void		getcolor(ulong, ulong*, ulong*, ulong*);
 int		getfields(char*, char**, int, char*);
 void		gotolabel(Label*);
 void		graphicsactive(int);
+void		graphicscmap(int);
 int		haswaitq(void*);
 long		hostdomainwrite(char*, int);
 long		hostownerwrite(char*, int);