--- np2/io/gdc.c	2003/12/01 10:45:46	1.7
+++ np2/io/gdc.c	2004/02/18 21:58:41	1.19
@@ -1,23 +1,42 @@
 #include	"compiler.h"
 #include	"scrnmng.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"vram.h"
 #include	"palettes.h"
 #include	"gdc_cmd.tbl"
+#include	"timing.h"
 
 
-#define	SEARHC_SYNC
+#define	SEARCH_SYNC
 #define	TURE_SYNC
 
+typedef struct {
+	UINT32	clock;
+	UINT	minx;
+	UINT	maxx;
+	UINT	miny;
+	UINT	maxy;
+} GDCCLK;
 
-static const BYTE defdegpal[4] = {0x04,0x15,0x26,0x37};
-static const BYTE defsync[8] = {0x10,0x4e,0x07,0x25,0x07,0x07,0x90,0x65};
+static const GDCCLK gdcclk[] = {
+			{14318180 / 8, 112 - 8, 112 + 8, 200, 300},
+			{21052600 / 8, 106 - 6, 106 + 6, 400, 575},
+			{25056815 / 8, 106 - 6, 106 + 6, 400, 575},
+			{25175000 / 8, 100 - 4, 100 + 4, 400, 575}};
 
 
-void gdc_setdegitalpal(int color, BYTE value) {
+static const UINT8 defdegpal[4] = {0x04,0x15,0x26,0x37};
+
+static const UINT8 defsyncm15[8] = {0x10,0x4e,0x07,0x25,0x0d,0x0f,0xc8,0x94};
+static const UINT8 defsyncs15[8] = {0x06,0x26,0x03,0x11,0x86,0x0f,0xc8,0x94};
+
+static const UINT8 defsyncm24[8] = {0x10,0x4e,0x07,0x25,0x07,0x07,0x90,0x65};
+static const UINT8 defsyncs24[8] = {0x06,0x26,0x03,0x11,0x83,0x07,0x90,0x65};
+
+
+void gdc_setdegitalpal(int color, REG8 value) {
 
 	if (color & 4) {
 		color &= 3;
@@ -39,21 +58,21 @@ void gdc_setdegitalpal(int color, BYTE v
 	}
 }
 
-void gdc_setanalogpal(int color, int rgb, BYTE value) {
+void gdc_setanalogpal(int color, int rgb, REG8 value) {
 
-	BYTE		*ptr;
+	UINT8		*ptr;
 	PAL1EVENT	*event;
 
-	ptr = ((BYTE *)(gdc.anapal + color)) + rgb;
+	ptr = ((UINT8 *)(gdc.anapal + color)) + rgb;
 	if (((*ptr) ^ value) & 0x0f) {
 		gdcs.palchange = GDCSCRN_REDRAW;
 		if (palevent.events < PALEVENTMAX) {
 			if (!gdc.vsync) {
 				event = palevent.event + palevent.events;
 				event->clock = nevent.item[NEVENT_FLAMES].clock -
-											(I286_BASECLOCK - I286_REMCLOCK);
+											(CPU_BASECLOCK - CPU_REMCLOCK);
 				event->color = (color * sizeof(RGB32)) + rgb;
-				event->value = value;
+				event->value = (UINT8)value;
 				palevent.events++;
 			}
 			else {
@@ -64,17 +83,17 @@ void gdc_setanalogpal(int color, int rgb
 	*ptr = value;
 }
 
-void gdc_setdegpalpack(int color, BYTE value) {
+void gdc_setdegpalpack(int color, REG8 value) {
 
 	if ((gdc.degpal[color] ^ value) & 0x77) {
 		gdcs.palchange = GDCSCRN_REDRAW;
 	}
-	gdc.degpal[color] = value;
+	gdc.degpal[color] = (UINT8)value;
 }
 
 void gdc_paletteinit(void) {
 
-	BYTE	c;
+	int		c;
 
 	CopyMemory(gdc.degpal, defdegpal, 4);
 	for (c=0; c<8; c++) {
@@ -96,48 +115,66 @@ void gdc_paletteinit(void) {
 
 static void vectdraw(void) {
 
-	UINT32	csrw;
-	UINT16	textw;
+	UINT32		csrw;
+const GDCVECT	*vect;
+	REG16		textw;
+	REG8		ope;
 
 	csrw = LOADINTELDWORD(gdc.s.para + GDC_CSRW);
+	vect = (GDCVECT *)(gdc.s.para + GDC_VECTW);
 	textw = LOADINTELWORD(gdc.s.para + GDC_TEXTW);
+	ope = gdc.s.para[GDC_WRITE];
 
-	if (gdc.s.para[GDC_VECTW] & 0x8) {
-		gdcsub_line(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW),
-											textw, gdc.s.para[GDC_WRITE]);
+	if (vect->ope & 0x08) {
+		gdcsub_vectl(csrw, vect, textw, ope);
 	}
-	if (gdc.s.para[GDC_VECTW] & 0x20) {
-		gdcsub_circle(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW),
-											textw, gdc.s.para[GDC_WRITE]);
+	if (vect->ope & 0x10) {		// undocumented
+		gdcsub_vectt(csrw, vect, textw, ope);
 	}
-	if (gdc.s.para[GDC_VECTW] & 0x40) {
-		gdcsub_box(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW),
-											textw, gdc.s.para[GDC_WRITE]);
+	if (vect->ope & 0x20) {
+		gdcsub_vectc(csrw, vect, textw, ope);
+	}
+	if (vect->ope & 0x40) {
+		gdcsub_vectr(csrw, vect, textw, ope);
 	}
 }
 
-static void textdraw(void) {									// ver0.30
+static void textdraw(void) {
 
-	UINT32	csrw;
-	UINT16	textw;
+	UINT32		csrw;
+const GDCVECT	*vect;
+	REG16		textw;
+	REG8		ope;
 
-	if (gdc.s.para[GDC_VECTW] & 0x10) {
-		csrw = LOADINTELDWORD(gdc.s.para + GDC_CSRW);
-		textw = LOADINTELWORD(gdc.s.para + GDC_TEXTW);
-		gdcsub_text(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW),
-											textw, gdc.s.para[GDC_WRITE]);
+	csrw = LOADINTELDWORD(gdc.s.para + GDC_CSRW);
+	vect = (GDCVECT *)(gdc.s.para + GDC_VECTW);
+	textw = gdc.s.para[GDC_TEXTW + 7];
+	textw = (textw << 8) + textw;
+	ope = gdc.s.para[GDC_WRITE];
+
+	if (vect->ope & 0x08) {		// undocumented
+		gdcsub_vectl(csrw, vect, textw, ope);
+	}
+	if (vect->ope & 0x10) {
+		gdcsub_text(csrw, vect, gdc.s.para + GDC_TEXTW, ope);
+	}
+	if (vect->ope & 0x20) {		// undocumented
+		gdcsub_vectc(csrw, vect, textw, ope);
+	}
+	if (vect->ope & 0x40) {		// undocumented
+		gdcsub_vectr(csrw, vect, textw, ope);
 	}
 }
 
 void gdc_work(int id) {
 
-	UINT16		i;
-	BYTE		data;
 	GDCDATA		item;
-	BYTE		*dispflag;
+	UINT8		*dispflag;
+	UINT		i;
+	BYTE		data;
 
-	item = ((id==GDCWORK_MASTER)?(&gdc.m):(&gdc.s));
-	dispflag = ((id==GDCWORK_MASTER)?(&gdcs.textdisp):(&gdcs.grphdisp));
+	item = (id == GDCWORK_MASTER)?&gdc.m:&gdc.s;
+	dispflag = (id == GDCWORK_MASTER)?&gdcs.textdisp:&gdcs.grphdisp;
 
 	for (i=0; i<item->cnt; i++) {
 		data = (BYTE)item->fifo[i];
@@ -151,11 +188,13 @@ void gdc_work(int id) {
 						item->rcv = 2;
 						item->paracb = 1;
 						break;
+
 					case 0x10:
 					case 0x18:
 						item->rcv = 1;
 						item->paracb = 1;
 						break;
+
 					default:
 						item->rcv = 0;
 						break;
@@ -172,6 +211,7 @@ void gdc_work(int id) {
 					screenupdate |= 2;								// ver0.28
 					break;
 
+				case CMD_STOP_:
 				case CMD_STOP:
 				case CMD_SYNC_OFF:
 					(*dispflag) &= (~GDCSCRN_ENABLE);
@@ -190,7 +230,6 @@ void gdc_work(int id) {
 						textdraw();
 					}
 					break;
-				
 			}
 			item->ptr = gdc_cmd[data].pos;
 			item->rcv = gdc_cmd[data].outdatas;
@@ -231,6 +270,72 @@ void gdc_forceready(GDCDATA item) {
 	item->snd = 0;
 }
 
+
+void gdc_updateclock(void) {
+
+	UINT		tmp;
+	UINT		cr;
+	UINT		hfbs;
+	UINT		vfbs;
+	UINT		lf;
+	UINT		x;
+	UINT		y;
+	UINT		cnt;
+const GDCCLK	*clk;
+	UINT32		hclock;
+
+	cr = gdc.m.para[GDC_SYNC + 1] + 2;
+	tmp = LOADINTELWORD(gdc.m.para + GDC_SYNC + 2);
+	hfbs = tmp & 0x1f;									// HS
+	hfbs += tmp >> 10;									// HFP
+	vfbs = (tmp >> 5) & 0x1f;							// VS
+	hfbs += gdc.m.para[GDC_SYNC + 4] & 0x3f;			// HFP
+	vfbs += gdc.m.para[GDC_SYNC + 5] & 0x3f;			// VFP
+	tmp = LOADINTELWORD(gdc.m.para + GDC_SYNC + 6);
+	lf = ((tmp - 1) & 0x3ff) + 1;
+	vfbs += tmp >> 10;									// VBP
+
+	hfbs += 3;
+	x = cr + hfbs;
+	if (!vfbs) {
+		vfbs = 1;
+	}
+	y = lf + vfbs;
+//	TRACEOUT(("h %d:%d / v %d:%d", cr, x, lf, y));
+
+	if (!(gdc.crt15khz & 2)) {							// 24.83±300Hz
+		clk = gdcclk + 1;
+	}
+	else {												// 15.98±300Hz
+		clk = gdcclk;
+	}
+
+	if (x < clk->minx) {
+		cr = (clk->minx * cr) / x;
+		x = clk->minx;
+	}
+	else if (x > clk->maxx) {
+		cr = (clk->maxx * cr) / x;
+		x = clk->maxx;
+	}
+	if (y < clk->miny) {
+		lf = (clk->miny * lf) / y;
+		y = clk->miny;
+	}
+	else if (y > clk->maxy) {
+		lf = (clk->maxy * lf) / y;
+		y = clk->maxy;
+	}
+	hclock = clk->clock / x;
+	cnt = (pccore.baseclock * y) / hclock;
+	cnt *= pccore.multiple;
+	gdc.rasterclock = cnt / y;
+	gdc.hsyncclock = (gdc.rasterclock * cr) / x;
+	gdc.dispclock = gdc.rasterclock * lf;
+	gdc.vsyncclock = cnt - gdc.dispclock;
+	timing_setrate(y, hclock);
+}
+
 void gdc_restorekacmode(void) {
 
 	BYTE	bit;
@@ -245,7 +350,7 @@ void gdc_restorekacmode(void) {
 
 // ---- I/O
 
-static void IOOUTCALL gdc_o60(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_o60(UINT port, REG8 dat) {
 
 	if (gdc.m.cnt < GDCCMD_MAX) {
 		gdc.m.fifo[gdc.m.cnt++] = dat;
@@ -253,7 +358,7 @@ static void IOOUTCALL gdc_o60(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_o62(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_o62(UINT port, REG8 dat) {
 
 	if (gdc.m.cnt < GDCCMD_MAX) {
 		gdc.m.fifo[gdc.m.cnt++] = 0x100 | dat;
@@ -262,16 +367,16 @@ static void IOOUTCALL gdc_o62(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_o64(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_o64(UINT port, REG8 dat) {
 
 	gdc.vsyncint = 1;
 	(void)port;
 	(void)dat;
 }
 
-static void IOOUTCALL gdc_o68(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_o68(UINT port, REG8 dat) {
 
-	BYTE	bit;
+	REG8	bit;
 
 	if (!(dat & 0xf0)) {									// ver0.28
 		bit = 1 << ((dat >> 1) & 7);
@@ -288,6 +393,9 @@ static void IOOUTCALL gdc_o68(UINT port,
 			gdcs.grphdisp |= GDCSCRN_ALLDRAW2;
 			gdcs.palchange = GDCSCRN_REDRAW;
 		}
+		else if (bit == 0x08) {
+			gdcs.textdisp |= GDCSCRN_ALLDRAW2;
+		}
 		else if (bit == 0x20) {
 			gdc_restorekacmode();
 		}
@@ -299,9 +407,9 @@ static void IOOUTCALL gdc_o68(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_o6a(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_o6a(UINT port, REG8 dat) {
 
-	BYTE	bit;
+	REG8	bit;
 
 	if (!(dat & 0xf8)) {
 		bit = (dat >> 1) & 3;
@@ -334,11 +442,13 @@ static void IOOUTCALL gdc_o6a(UINT port,
 	else {
 		switch(dat) {
 			case 0x40:
+			case 0x80:					// EPSON?
 				gdc.display &= ~1;
 				gdcs.textdisp |= GDCSCRN_EXT;
 				break;
 
 			case 0x41:
+			case 0x81:					// EPSON?
 				gdc.display |= 1;
 				gdcs.textdisp |= GDCSCRN_EXT;
 				break;
@@ -367,15 +477,31 @@ static void IOOUTCALL gdc_o6a(UINT port,
 	(void)port;
 }
 
-static BYTE IOINPCALL gdc_i60(UINT port) {
+static void IOOUTCALL gdc_o6e(UINT port, REG8 dat) {
+
+	switch(dat) {
+		case 0:
+			gdc.crt15khz &= ~1;
+			gdcs.textdisp |= GDCSCRN_ALLDRAW2;
+			break;
+
+		case 1:
+			gdc.crt15khz |= 1;
+			gdcs.textdisp |= GDCSCRN_ALLDRAW2;
+			break;
+	}
+	(void)port;
+}
+
+static REG8 IOINPCALL gdc_i60(UINT port) {
 
-	BYTE	ret;
-	long	remain;
+	REG8	ret;
+	SINT32	remain;
 
 	ret = 0x80 | gdc.vsync;		// | m_drawing;
 	remain = nevent_getremain(NEVENT_FLAMES);
 	if (remain >= 0) {
-		if ((remain % pc.raster) < pc.hsync) {
+		if ((remain % gdc.rasterclock) < gdc.hsyncclock) {
 			ret |= 0x40;
 		}
 	}
@@ -391,33 +517,33 @@ static BYTE IOINPCALL gdc_i60(UINT port)
 	else {
 		gdc_work(GDCWORK_MASTER);
 	}
-#ifdef SEARHC_SYNC
-	if ((i286core.s.inport) && (I286_REMCLOCK >= 5)) {
+#ifdef SEARCH_SYNC
+	if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) {
 		UINT16 jadr = 0xfa74;
 		UINT16 memv;
-		memv = i286_memoryread_w(i286core.s.inport);
+		memv = i286_memoryread_w(CPU_INPADRS);
 		while((memv == 0x00eb) || (memv == 0x5fe6)) {
 			jadr -= 0x200;
-			i286core.s.inport += 2;
-			memv = i286_memoryread_w(i286core.s.inport);
+			CPU_INPADRS += 2;
+			memv = i286_memoryread_w(CPU_INPADRS);
 		}
 		if ((memv == 0x20a8) || (memv == 0x2024)) {
-			memv = i286_memoryread_w(i286core.s.inport + 2);
+			memv = i286_memoryread_w(CPU_INPADRS + 2);
 			if (memv == jadr) {					// je
 				if (!gdc.vsync) {
-					I286_REMCLOCK = -1;
+					CPU_REMCLOCK = -1;
 				}
 			}
 			else if (memv == (jadr + 1)) {		// jne
 				if (gdc.vsync) {
-					I286_REMCLOCK = -1;
+					CPU_REMCLOCK = -1;
 				}
 			}
 		}
 	}
 #endif
 #ifdef TURE_SYNC				// クロックイベントの誤差修正
-	if (nevent.item[NEVENT_FLAMES].clock < (I286_BASECLOCK - I286_REMCLOCK)) {
+	if (nevent.item[NEVENT_FLAMES].clock < (CPU_BASECLOCK - CPU_REMCLOCK)) {
 		ret ^= 0x20;
 	}
 #endif
@@ -425,7 +551,7 @@ static BYTE IOINPCALL gdc_i60(UINT port)
 	return(ret);
 }
 
-static BYTE IOINPCALL gdc_i62(UINT port) {
+static REG8 IOINPCALL gdc_i62(UINT port) {
 
 	if (gdc.m.snd) {
 		gdc.m.snd--;
@@ -435,20 +561,20 @@ static BYTE IOINPCALL gdc_i62(UINT port)
 	return(0xff);
 }
 
-static BYTE IOINPCALL gdc_i68(UINT port) {
+static REG8 IOINPCALL gdc_i68(UINT port) {
 
 	(void)port;
 	return(gdc.mode1);
 }
 
-static BYTE IOINPCALL gdc_i6a(UINT port) {
+static REG8 IOINPCALL gdc_i6a(UINT port) {
 
 	(void)port;
 	return(gdc.mode2);
 }
 
 
-static void IOOUTCALL gdc_oa0(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oa0(UINT port, REG8 dat) {
 
 	if (gdc.s.cnt < GDCCMD_MAX) {
 		gdc.s.fifo[gdc.s.cnt++] = dat;
@@ -460,7 +586,7 @@ static void IOOUTCALL gdc_oa0(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oa2(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oa2(UINT port, REG8 dat) {
 
 	if (gdc.s.cnt < GDCCMD_MAX) {
 		gdc.s.fifo[gdc.s.cnt++] = 0x100 | dat;
@@ -470,7 +596,7 @@ static void IOOUTCALL gdc_oa2(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oa4(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oa4(UINT port, REG8 dat) {
 
 	if ((gdcs.disp ^ dat) & 1) {
 		gdcs.disp = dat & 1;
@@ -479,7 +605,7 @@ static void IOOUTCALL gdc_oa4(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oa6(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oa6(UINT port, REG8 dat) {
 
 	if ((gdcs.access ^ dat) & 1) {
 		gdcs.access = dat & 1;
@@ -490,7 +616,7 @@ static void IOOUTCALL gdc_oa6(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oa8(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oa8(UINT port, REG8 dat) {
 
 	if (gdc.analog) {
 		gdc.palnum = dat & 0x0f;
@@ -501,7 +627,7 @@ static void IOOUTCALL gdc_oa8(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oaa(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oaa(UINT port, REG8 dat) {
 
 	if (gdc.analog) {
 		gdc_setanalogpal(gdc.palnum, offsetof(RGB32, p.g), dat);
@@ -512,7 +638,7 @@ static void IOOUTCALL gdc_oaa(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oac(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oac(UINT port, REG8 dat) {
 
 	if (gdc.analog) {
 		gdc_setanalogpal(gdc.palnum, offsetof(RGB32, p.r), dat);
@@ -523,7 +649,7 @@ static void IOOUTCALL gdc_oac(UINT port,
 	(void)port;
 }
 
-static void IOOUTCALL gdc_oae(UINT port, BYTE dat) {
+static void IOOUTCALL gdc_oae(UINT port, REG8 dat) {
 
 	if (gdc.analog) {
 		gdc_setanalogpal(gdc.palnum, offsetof(RGB32, p.b), dat);
@@ -534,15 +660,15 @@ static void IOOUTCALL gdc_oae(UINT port,
 	(void)port;
 }
 
-static BYTE IOINPCALL gdc_ia0(UINT port) {
+static REG8 IOINPCALL gdc_ia0(UINT port) {
 
-	BYTE	ret;
+	REG8	ret;
 	SINT32	remain;
 
 	ret = 0x80 | gdc.vsync | gdc.s_drawing;
 	remain = nevent_getremain(NEVENT_FLAMES);
 	if (remain >= 0) {
-		if ((remain % pc.raster) < (pc.hsync)) {
+		if ((remain % gdc.rasterclock) < (gdc.hsyncclock)) {
 			ret |= 0x40;
 		}
 	}
@@ -557,34 +683,35 @@ static BYTE IOINPCALL gdc_ia0(UINT port)
 	}
 	else {
 		gdc_work(GDCWORK_SLAVE);
+		TRACEOUT(("gdc.s.cnt=%d", gdc.s.cnt));
 	}
-#ifdef SEARHC_SYNC
-	if ((i286core.s.inport) && (I286_REMCLOCK >= 5)) {
+#ifdef SEARCH_SYNC
+	if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) {
 		UINT16 jadr = 0xfa74;
 		UINT16 memv;
-		memv = i286_memoryread_w(i286core.s.inport);
+		memv = i286_memoryread_w(CPU_INPADRS);
 		while((memv == 0x00eb) || (memv == 0x5fe6)) {
 			jadr -= 0x200;
-			i286core.s.inport += 2;
-			memv = i286_memoryread_w(i286core.s.inport);
+			CPU_INPADRS += 2;
+			memv = i286_memoryread_w(CPU_INPADRS);
 		}
 		if ((memv == 0x20a8) || (memv == 0x2024)) {
-			memv = i286_memoryread_w(i286core.s.inport + 2);
+			memv = i286_memoryread_w(CPU_INPADRS + 2);
 			if (memv == jadr) {					// je
 				if (!gdc.vsync) {
-					I286_REMCLOCK = -1;
+					CPU_REMCLOCK = -1;
 				}
 			}
 			else if (memv == (jadr + 1)) {		// jne
 				if (gdc.vsync) {
-					I286_REMCLOCK = -1;
+					CPU_REMCLOCK = -1;
 				}
 			}
 		}
 	}
 #endif
 #ifdef TURE_SYNC				// クロックイベントの誤差修正
-	if (nevent.item[NEVENT_FLAMES].clock < (I286_BASECLOCK - I286_REMCLOCK)) {
+	if (nevent.item[NEVENT_FLAMES].clock < (CPU_BASECLOCK - CPU_REMCLOCK)) {
 		ret ^= 0x20;
 	}
 #endif
@@ -592,7 +719,7 @@ static BYTE IOINPCALL gdc_ia0(UINT port)
 	return(ret);
 }
 
-static BYTE IOINPCALL gdc_ia2(UINT port) {
+static REG8 IOINPCALL gdc_ia2(UINT port) {
 
 	if (gdc.s.snd) {
 		gdc.s.snd--;
@@ -602,13 +729,13 @@ static BYTE IOINPCALL gdc_ia2(UINT port)
 	return(0xff);
 }
 
-static BYTE IOINPCALL gdc_ia4(UINT port) {
+static REG8 IOINPCALL gdc_ia4(UINT port) {
 
 	(void)port;
 	return(gdcs.disp);
 }
 
-static BYTE IOINPCALL gdc_ia6(UINT port) {
+static REG8 IOINPCALL gdc_ia6(UINT port) {
 
 	(void)port;
 	return(gdcs.access);
@@ -619,7 +746,7 @@ static BYTE IOINPCALL gdc_ia6(UINT port)
 
 static const IOOUT gdco60[8] = {
 					gdc_o60,	gdc_o62,	gdc_o64,	NULL,
-					gdc_o68,	gdc_o6a,	NULL,		NULL};
+					gdc_o68,	gdc_o6a,	NULL,		gdc_o6e};
 
 static const IOOUT gdcoa0[8] = {
 					gdc_oa0,	gdc_oa2,	gdc_oa4,	gdc_oa6,
@@ -638,29 +765,43 @@ void gdc_reset(void) {
 	ZeroMemory(&gdc, sizeof(gdc));
 	ZeroMemory(&gdcs, sizeof(gdcs));
 
-	gdc.mode1 = 0x98;
-
-	gdc.m.para[GDC_CSRFORM + 0] = 0x0f;
-	gdc.m.para[GDC_CSRFORM + 1] = 0xc0;
-	gdc.m.para[GDC_CSRFORM + 2] = 0x7b;
-	CopyMemory(gdc.m.para + GDC_SYNC, defsync, 8);
-	CopyMemory(gdc.s.para + GDC_SYNC, defsync, 8);
+	if (!(np2cfg.dipsw[0] & 0x01)) {
+		gdc.mode1 = 0x98;
+		gdc.m.para[GDC_CSRFORM + 0] = 0x0f;
+		gdc.m.para[GDC_CSRFORM + 1] = 0xc0;
+		gdc.m.para[GDC_CSRFORM + 2] = 0x7b;
+		CopyMemory(gdc.m.para + GDC_SYNC, defsyncm24, 8);
+		gdc.s.para[GDC_CSRFORM + 0] = 1;
+		CopyMemory(gdc.s.para + GDC_SYNC, defsyncs24, 8);
+	}
+	else {
+		gdc.crt15khz = 3;
+		gdc.mode1 = 0x80;
+		gdc.m.para[GDC_CSRFORM + 0] = 0x07;
+		gdc.m.para[GDC_CSRFORM + 1] = 0xc0;
+		gdc.m.para[GDC_CSRFORM + 2] = 0x3b;
+		CopyMemory(gdc.m.para + GDC_SYNC, defsyncm15, 8);
+		CopyMemory(gdc.s.para + GDC_SYNC, defsyncs15, 8);
+	}
 
-	gdc.s.para[GDC_CSRFORM] = 1;
 	gdc.clock = 0;
-	gdc.m.para[GDC_PITCH] = 80;					// ver0.26
+	gdc.m.para[GDC_PITCH] = 80;
 	gdc.s.para[GDC_PITCH] = 40;
 
 	gdc_paletteinit();
 
 	gdcs.textdisp = GDCSCRN_ENABLE | GDCSCRN_ALLDRAW2 | GDCSCRN_EXT;
 	gdcs.grphdisp = GDCSCRN_ALLDRAW2 | GDCSCRN_EXT;
-	gdc.display = (np2cfg.color16 & 1) << 1;
+	if (np2cfg.color16 & 1) {
+		gdc.s.para[GDC_SYNC] = 0x16;
+		gdc.display = 2;
+	}
 	gdc.bitac = 0xff;
 }
 
 void gdc_bind(void) {
 
+	gdc_updateclock();
 	iocore_attachsysoutex(0x0060, 0x0cf1, gdco60, 8);
 	iocore_attachsysinpex(0x0060, 0x0cf1, gdci60, 8);
 	iocore_attachsysoutex(0x00a0, 0x0cf1, gdcoa0, 8);