--- np2/io/gdc.c	2004/02/14 07:56:51	1.17
+++ np2/io/gdc.c	2004/02/26 08:44:32	1.23
@@ -3,9 +3,10 @@
 #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"gdc_cmd.tbl"
+#include	"gdc_sub.h"
 #include	"vram.h"
 #include	"palettes.h"
-#include	"gdc_cmd.tbl"
 #include	"timing.h"
 
 
@@ -20,14 +21,17 @@ typedef struct {
 	UINT	maxy;
 } GDCCLK;
 
+// 31kHzの時の動作クロックが不明…
 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}};
+			{25260000 / 8, 100 - 8, 100 + 8, 400, 575}};
 
 
-static const UINT8 defdegpal[4] = {0x04,0x15,0x26,0x37};
+typedef struct {
+	UINT8	master[8];
+	UINT8	slave[8];
+} GDCSYNC;
 
 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};
@@ -35,6 +39,14 @@ static const UINT8 defsyncs15[8] = {0x06
 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};
 
+static const UINT8 defsyncm31[8] = {0x10,0x4e,0x47,0x0c,0x07,0x0d,0x90,0x89};
+static const UINT8 defsyncs31[8] = {0x06,0x26,0x41,0x0c,0x83,0x0d,0x90,0x89};
+
+
+static const UINT8 defdegpal[4] = {0x04,0x15,0x26,0x37};
+
+
+
 
 void gdc_setdegitalpal(int color, REG8 value) {
 
@@ -113,6 +125,20 @@ void gdc_paletteinit(void) {
 
 // --------------------------------------------------------------------------
 
+void gdc_vectreset(GDCDATA item) {
+
+	item->para[GDC_VECTW+1] = 0x00;
+	item->para[GDC_VECTW+2] = 0x00;
+	item->para[GDC_VECTW+3] = 0x08;
+	item->para[GDC_VECTW+4] = 0x00;
+	item->para[GDC_VECTW+5] = 0x08;
+	item->para[GDC_VECTW+6] = 0x00;
+	item->para[GDC_VECTW+7] = 0xff;
+	item->para[GDC_VECTW+8] = 0xff;
+	item->para[GDC_VECTW+9] = 0xff;
+	item->para[GDC_VECTW+10] = 0xff;
+}
+
 static void vectdraw(void) {
 
 	UINT32		csrw;
@@ -137,6 +163,7 @@ const GDCVECT	*vect;
 	if (vect->ope & 0x40) {
 		gdcsub_vectr(csrw, vect, textw, ope);
 	}
+	gdc_vectreset(&gdc.s);
 }
 
 static void textdraw(void) {
@@ -164,6 +191,7 @@ const GDCVECT	*vect;
 	if (vect->ope & 0x40) {		// undocumented
 		gdcsub_vectr(csrw, vect, textw, ope);
 	}
+	gdc_vectreset(&gdc.s);
 }
 
 void gdc_work(int id) {
@@ -171,15 +199,15 @@ void gdc_work(int id) {
 	GDCDATA		item;
 	UINT8		*dispflag;
 	UINT		i;
-	BYTE		data;
+	UINT8		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];
+		data = (UINT8)item->fifo[i];
 		if (item->fifo[i] & 0xff00) {
-			item->cmd = data;										// ver0.29
+			item->cmd = data;
 			item->paracb = 0;
 			if ((data & 0x60) == 0x20) {
 				item->para[GDC_WRITE] = data;
@@ -208,7 +236,7 @@ void gdc_work(int id) {
 				case CMD_START:
 				case CMD_SYNC_ON:
 					(*dispflag) |= GDCSCRN_ENABLE | GDCSCRN_ALLDRAW2;
-					screenupdate |= 2;								// ver0.28
+					screenupdate |= 2;
 					break;
 
 				case CMD_STOP_:
@@ -216,7 +244,7 @@ void gdc_work(int id) {
 				case CMD_SYNC_OFF:
 					(*dispflag) &= (~GDCSCRN_ENABLE);
 //					(*dispflag) |= GDCSCRN_ALLDRAW2;
-					screenupdate |= 2;								// ver0.28
+					screenupdate |= 2;
 					break;
 
 				case CMD_VECTE:
@@ -225,7 +253,7 @@ void gdc_work(int id) {
 					}
 					break;
 
-				case CMD_TEXTE:										// ver0.30
+				case CMD_TEXTE:
 					if (id != GDCWORK_MASTER) {
 						textdraw();
 					}
@@ -252,11 +280,11 @@ void gdc_work(int id) {
 				(*dispflag) |= gdc_dirtyflag[id][item->ptr];
 			}
 			(item->ptr)++;
-			(item->rcv)--;					// ver0.29
+			(item->rcv)--;
 			if ((!(item->rcv)) && (id == GDCWORK_SLAVE) &&
 				(((item->cmd) & 0xe4) == 0x20)) {
 				gdcsub_write();
-				item->paracb = 0;			// ver0.29
+				item->paracb = 0;
 			}
 		}
 	}
@@ -264,8 +292,13 @@ void gdc_work(int id) {
 }
 
 // BIOSとかで弄った時にリセット
-void gdc_forceready(GDCDATA item) {
+void gdc_forceready(int id) {
 
+	GDCDATA	item;
+	item = (id == GDCWORK_MASTER)?&gdc.m:&gdc.s;
+	if (item->cnt) {
+		gdc_work(id);
+	}
 	item->rcv = 0;
 	item->snd = 0;
 }
@@ -378,7 +411,7 @@ static void IOOUTCALL gdc_o68(UINT port,
 
 	REG8	bit;
 
-	if (!(dat & 0xf0)) {									// ver0.28
+	if (!(dat & 0xf0)) {
 		bit = 1 << ((dat >> 1) & 7);
 		if (dat & 1) {
 			gdc.mode1 |= bit;
@@ -389,7 +422,7 @@ static void IOOUTCALL gdc_o68(UINT port,
 		if (bit & (0x01 | 0x04 | 0x10)) {
 			gdcs.grphdisp |= GDCSCRN_ALLDRAW2;
 		}
-		else if (bit == 0x02) {								// ver0.28
+		else if (bit == 0x02) {
 			gdcs.grphdisp |= GDCSCRN_ALLDRAW2;
 			gdcs.palchange = GDCSCRN_REDRAW;
 		}
@@ -579,8 +612,8 @@ static void IOOUTCALL gdc_oa0(UINT port,
 	if (gdc.s.cnt < GDCCMD_MAX) {
 		gdc.s.fifo[gdc.s.cnt++] = dat;
 	}
-//	TRACEOUT(("GDC-B %.2x", dat));
-	if (gdc.s.paracb) {						// ver0.29
+//	TRACEOUT(("GDC-B %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	if (gdc.s.paracb) {
 		gdc_work(GDCWORK_SLAVE);
 	}
 	(void)port;
@@ -683,7 +716,6 @@ static REG8 IOINPCALL gdc_ia0(UINT port)
 	}
 	else {
 		gdc_work(GDCWORK_SLAVE);
-		TRACEOUT(("gdc.s.cnt=%d", gdc.s.cnt));
 	}
 #ifdef SEARCH_SYNC
 	if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) {
@@ -783,6 +815,8 @@ void gdc_reset(void) {
 		CopyMemory(gdc.m.para + GDC_SYNC, defsyncm15, 8);
 		CopyMemory(gdc.s.para + GDC_SYNC, defsyncs15, 8);
 	}
+	gdc_vectreset(&gdc.m);
+	gdc_vectreset(&gdc.s);
 
 	gdc.clock = 0;
 	gdc.m.para[GDC_PITCH] = 80;
@@ -797,13 +831,6 @@ void gdc_reset(void) {
 		gdc.display = 2;
 	}
 	gdc.bitac = 0xff;
-
-#if 0	// bind で計算される筈
-	gdc.rasterclock = pccore.realclock / 24816;
-	gdc.hsyncclock = (gdc.rasterclock * 4) / 5;
-	gdc.dispclock = pccore.realclock * 50 / 3102;
-	gdc.vsyncclock = pccore.realclock * 5 / 3102;
-#endif
 }
 
 void gdc_bind(void) {