--- xmil/io/crtc.c	2004/08/13 01:35:59	1.11
+++ xmil/io/crtc.c	2004/08/17 14:46:37	1.17
@@ -3,11 +3,21 @@
 #include	"z80core.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"nevent.h"
 #include	"vram.h"
 #include	"palettes.h"
 #include	"makescrn.h"
 
 
+static const UINT8 defrgbp[4] = {0xaa, 0xcc, 0xf0, 0x00};
+static const UINT8 defreg[18] = {
+				0x37, 0x28, 0x2d, 0x34,
+				0x1f, 0x02, 0x19, 0x1c,
+				0x00, 0x07, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00};
+
+#if defined(SUPPORT_TURBOZ)
 static const UINT8 defpaltext[8] = {
 				0x00, 0x03, 0x0c, 0x0f, 0x30, 0x33, 0x3c, 0x3f};
 
@@ -20,21 +30,98 @@ static const UINT16 defpalgrph[64] = {
 				0x505, 0x50f, 0x5a5, 0x5af, 0xf05, 0xf0f, 0xfa5, 0xfaf,
 				0x550, 0x55a, 0x5f0, 0x5fa, 0xf50, 0xf5a, 0xff0, 0xffa,
 				0x555, 0x55f, 0x5f5, 0x5ff, 0xf55, 0xf5f, 0xff5, 0xfff};
+#endif
 
-static const UINT8 defrgbp[4] = {0xaa, 0xcc, 0xf0, 0x00};
-static const UINT8 defreg[18] = {
-				55, 40, 45, 0x36,
-				31, 10, 25, 28,
-				7, 7, 0, 0,
-				0, 0, 0, 0, 0, 0};
 
+typedef struct {
+	UINT32	clock;
+	UINT	minx;
+	UINT	maxx;
+	UINT	miny;
+	UINT	maxy;
+} GDCCLK;
+
+static const GDCCLK gdcclk[] = {
+			{14318180 / 8, 112 - 8, 112 + 8, 200, 300},
+			{21052600 / 8, 108 - 6, 108 + 6, 400, 575}};
+
+enum {
+	CRTCUPD_CLOCK		= 0x01,
+	CRTCUPD_TIMING		= 0x02,
+	CRTCUPD_POS			= 0x04
+};
+
+
+static void crtc_clkupdate(void) {
+
+	UINT		clksync;
+const GDCCLK	*clk;
+	UINT		h;
+	UINT		fonty;
+	UINT		v;
+
+	clksync = (crtc.s.SCRN_BITS & SCRN_24KHZ);
+	clk = gdcclk + clksync;
+	h = crtc.s.reg[CRTCREG_HSIZE] + 1;
+	if (crtc.s.width40) {
+		h = h * 2;
+	}
+	if (h < clk->minx) {
+		h = clk->minx;
+	}
+	else if (h > clk->maxx) {
+		h = clk->maxx;
+	}
+	crtc.e.rasterclock8 = (4000000 * h) / (clk->clock >> 8);
+
+	fonty = crtc.s.reg[CRTCREG_CHRCY] & 0x1f;
+	fonty >>= clksync;
+	fonty += 1;
+	crtc.e.fonty = fonty;
+
+	v = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
+	v = v * ((crtc.s.reg[CRTCREG_VSIZE] & 0x7f) + 1);
+	v = v + (crtc.s.reg[CRTCREG_VSIZEA] & 0x1f);
+	if (v < clk->miny) {
+		v = clk->miny;
+	}
+	else if (v > clk->maxy) {
+		v = clk->maxy;
+	}
+	crtc.e.frameclock = ((4000000 * h) / clk->clock) * v;
+}
+
+static void crtc_timingupdate(void) {
+
+	UINT32	fontclock;
+	UINT	yl;
+
+	// とりあえず…ね
+	crtc.e.rasterdisp8 = (crtc.e.rasterclock8 * 40) / 56;
+
+	fontclock = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
+	fontclock = (fontclock * crtc.e.rasterclock8) >> 8;
 
-void crtc_bankupdate(void) {
+	// YsIIIが yl==0で disp信号見る…なんで？
+	yl = (crtc.s.reg[CRTCREG_VDISP] & 0x7f);
+	crtc.e.yl = yl;
+	crtc.e.dispclock = fontclock * max(yl, 1);
+	crtc.e.vsyncstart = fontclock * ((crtc.s.reg[CRTCREG_VSYNC] & 0x7f) + 1);
+	crtc.e.vpulseclock = ((crtc.s.reg[CRTCREG_PULSE] >> 4)
+												* crtc.e.rasterclock8) >> 8;
 
+	crtc.e.pos = crtc.s.reg[CRTCREG_POSL]
+									+ ((crtc.s.reg[CRTCREG_POSH] & 7) << 8);
+}
+
+static void crtc_bankupdate(void) {
+
+#if defined(SUPPORT_TURBOZ)
 	UINT	updatemask;
 	UINT8	dispmode;
 	UINT8	pal_bank;
 	UINT8	pal_disp;
+#endif
 
 	if (crtc.s.SCRN_BITS & 0x10) {
 		crtc.e.gram = gram + GRAM_BANK1;
@@ -44,14 +131,20 @@ void crtc_bankupdate(void) {
 		crtc.e.gram = gram + GRAM_BANK0;
 		crtc.e.updatebit = UPDATE_VRAM0;
 	}
-	dispmode = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
-	pal_bank = pal_disp = PAL_NORMAL;
 
+#if !defined(SUPPORT_TURBOZ)
+	crtc.e.updatemask = (crtc.s.SCRN_BITS & SCRN_TEXTYx2)?0x3ff:0x7ff;
+	crtc.e.dispmode =
+					(crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
+#else
+	dispmode = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
+	pal_bank = PAL_NORMAL;
+	pal_disp = PAL_NORMAL;
 	if ((!(crtc.s.EXTPALMODE & 0x80)) || (crtc.s.SCRN_BITS & SCRN_UNDERLINE)) {
 		updatemask = 0x7ff;
-		if ((crtc.s.SCRN_BITS & SCRN_24KHZ) &&
-			(crtc.s.reg[CRTCREG_HDISP] == 80)) {
-			pal_bank = pal_disp = PAL_HIGHRESO;
+		if ((crtc.s.SCRN_BITS & SCRN_24KHZ) && (!crtc.s.width40)) {
+			pal_bank = PAL_HIGHRESO;
+			pal_disp = PAL_HIGHRESO;
 		}
 		if (crtc.s.SCRN_BITS & SCRN_TEXTYx2) {
 			updatemask = 0x3ff;
@@ -61,7 +154,7 @@ void crtc_bankupdate(void) {
 		updatemask = 0x3ff;
 		if (!(crtc.s.SCRN_BITS & SCRN_TEXTYx2)) {
 			if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-				if (crtc.s.reg[CRTCREG_HDISP] == 40) {
+				if (crtc.s.width40) {
 					if (crtc.s.SCRN_BITS & SCRN_200LINE) {	// width 40,25,0,2
 						dispmode |= SCRN64_320x200;
 					}
@@ -75,7 +168,7 @@ void crtc_bankupdate(void) {
 				}
 			}
 			else {
-				if (crtc.s.reg[CRTCREG_HDISP] == 40) {		// width 40,25,0,1
+				if (crtc.s.width40) {						// width 40,25,0,1
 					if (crtc.s.EXTPALMODE & 0x10) {
 						if (crtc.s.ZPRY & 0x10) {
 							dispmode = SCRN64_L320x200x2 |
@@ -106,7 +199,7 @@ void crtc_bankupdate(void) {
 		}
 		else {
 			if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-				if (crtc.s.reg[CRTCREG_HDISP] == 40) {
+				if (crtc.s.width40) {
 					if (crtc.s.SCRN_BITS & SCRN_200LINE) {	// width 40,12,0,2
 						dispmode |= SCRN64_320x100;
 					}
@@ -119,7 +212,7 @@ void crtc_bankupdate(void) {
 				}
 			}
 			else {
-				if (crtc.s.reg[CRTCREG_HDISP] == 40) {		// width 40,12,0,1
+				if (crtc.s.width40) {						// width 40,12,0,1
 					if (crtc.s.EXTPALMODE & 0x10) {
 						if (crtc.s.ZPRY & 0x10) {
 							dispmode = SCRN64_320x100x2 |
@@ -152,30 +245,7 @@ void crtc_bankupdate(void) {
 	crtc.e.dispmode = dispmode;
 	crtc.e.pal_bank = pal_bank;
 	crtc.e.pal_disp = pal_disp;
-}
-
-void crtc_regupdate(void) {
-
-	UINT	fonty;
-	SINT32	fontyclock;
-
-	crtc.e.pos = crtc.s.reg[CRTCREG_POSL]
-									+ ((crtc.s.reg[CRTCREG_POSH] & 7) << 8);
-
-	fonty = crtc.s.reg[CRTCREG_CHRCY] & 0x1f;
-	if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-		fonty >>= 1;
-	}
-	fonty += 1;
-	crtc.e.fonty = fonty;
-	crtc.e.yl = (crtc.s.reg[CRTCREG_VDISP] & 0x7f);
-
-	fontyclock = fonty * RASTER_CLOCK;
-	crtc.e.dispclock = fontyclock * crtc.e.yl;
-	crtc.e.vsyncstart = fontyclock * ((crtc.s.reg[CRTCREG_VSYNC] & 0x7f) + 1);
-	crtc.e.vpulseclock = (crtc.s.reg[CRTCREG_PULSE] >> 4) * RASTER_CLOCK;
-	crtc.e.vl = fonty * ((crtc.s.reg[CRTCREG_VSIZE] & 0x7f) + 1)
-						+ (crtc.s.reg[CRTCREG_VSIZEA] & 0x1f);
+#endif
 }
 
 
@@ -191,9 +261,10 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 		if (crtc.s.regnum < CRTCREG_MAX) {
 			if (crtc.s.reg[crtc.s.regnum] != value) {
 				crtc.s.reg[crtc.s.regnum] = value;
+				crtc_clkupdate();
+				crtc_timingupdate();
 				crtc_bankupdate();
 				makescrn.remakeattr = 1;
-				crtc_regupdate();
 				scrnallflash = 1;
 			}
 		}
@@ -213,7 +284,8 @@ void IOOUTCALL scrn_o(UINT port, REG8 va
 //		pal_reset();					// なんで？
 		scrnallflash = 1;
 		makescrn.palandply = 1;
-		crtc_regupdate();
+		crtc_clkupdate();
+		crtc_timingupdate();
 	}
 	crtc_bankupdate();
 	(void)port;
@@ -233,27 +305,51 @@ void IOOUTCALL ply_o(UINT port, REG8 val
 	if (crtc.s.rgbp[CRTC_PLY] != value) {
 		crtc.s.rgbp[CRTC_PLY] = value;
 		makescrn.palandply = 1;
+#if defined(SUPPORT_PALEVENT)
+		if ((!corestat.vsync) && (palevent.events < SUPPORT_PALEVENT)) {
+			PAL1EVENT *e = palevent.event + palevent.events;
+			palevent.events++;
+			e->rgbp = CRTC_PLY;
+			e->value = value;
+			e->clock = nevent_getwork(NEVENT_FRAMES);
+		}
+#endif
 	}
 	(void)port;
 }
 
-REG8 IOINPCALL ply_i(UINT port) {
-
-	(void)port;
-	return(crtc.s.rgbp[CRTC_PLY]);
-}
-
 
 // ---- パレット
 
 void IOOUTCALL palette_o(UINT port, REG8 value) {
 
-	REG8	sft;
 	UINT	num;
+#if defined(SUPPORT_TURBOZ)
+	REG8	sft;
 	UINT	pal;
+#endif
 
+#if defined(SUPPORT_TURBOZ)
 	crtc.s.lastpal = (value & 0xf0);
-	if (crtc.s.EXTPALMODE & 0x80) {
+	if (!(crtc.s.EXTPALMODE & 0x80)) {
+#endif
+		num = (port >> 8) & 3;
+		if (crtc.s.rgbp[num] != value) {
+			crtc.s.rgbp[num] = value;
+			makescrn.palandply = 1;
+#if defined(SUPPORT_PALEVENT)
+			if ((!corestat.vsync) && (palevent.events < SUPPORT_PALEVENT)) {
+				PAL1EVENT *e = palevent.event + palevent.events;
+				palevent.events++;
+				e->rgbp = (UINT8)num;
+				e->value = value;
+				e->clock = nevent_getwork(NEVENT_FRAMES);
+			}
+#endif
+		}
+#if defined(SUPPORT_TURBOZ)
+	}
+	else {
 		if ((crtc.s.EXTGRPHPAL & 0x88) != 0x80) {
 			return;
 		}
@@ -289,13 +385,41 @@ void IOOUTCALL palette_o(UINT port, REG8
 			pal_setgrph(crtc.e.pal_bank, (REG8)num);
 		}
 	}
-	else {
-		num = (port >> 8) & 3;
-		if (crtc.s.rgbp[num] != value) {
-			crtc.s.rgbp[num] = value;
-			makescrn.palandply = 1;
+#endif
+}
+
+void IOOUTCALL blackctrl_o(UINT port, REG8 value) {
+
+	if (crtc.s.rgbp[CRTC_BLACK] != value) {
+		crtc.s.rgbp[CRTC_BLACK] = value;
+		makescrn.palandply = 1;
+#if defined(SUPPORT_PALEVENT)
+		if ((!corestat.vsync) && (palevent.events < SUPPORT_PALEVENT)) {
+			PAL1EVENT *e = palevent.event + palevent.events;
+			palevent.events++;
+			e->rgbp = CRTC_BLACK;
+			e->value = value;
+			e->clock = nevent_getwork(NEVENT_FRAMES);
 		}
+#endif
 	}
+	(void)port;
+}
+
+REG8 IOINPCALL blackctrl_i(UINT port) {
+
+	(void)port;
+	return(crtc.s.rgbp[CRTC_BLACK]);
+}
+
+
+// ---- turboZ
+
+#if defined(SUPPORT_TURBOZ)
+REG8 IOINPCALL ply_i(UINT port) {
+
+	(void)port;
+	return(crtc.s.rgbp[CRTC_PLY]);
 }
 
 REG8 IOINPCALL palette_i(UINT port) {
@@ -336,8 +460,6 @@ REG8 IOINPCALL palette_i(UINT port) {
 }
 
 
-// ---- turboZ
-
 void IOOUTCALL extpal_o(UINT port, REG8 value) {
 
 	crtc.s.EXTPALMODE = value;
@@ -399,30 +521,39 @@ REG8 IOINPCALL exttextdisp_i(UINT port) 
 	(void)port;
 	return(0xff);
 }
+#endif
 
-void IOOUTCALL blackctrl_o(UINT port, REG8 value) {
 
-	crtc.s.BLACKPAL = value;
+// ----
+
+void crtc_update(void) {
+
+	crtc_clkupdate();
+	crtc_timingupdate();
+	crtc_bankupdate();
 	makescrn.palandply = 1;
-	(void)port;
+	scrnallflash = 1;
 }
 
-REG8 IOINPCALL blackctrl_i(UINT port) {
+void crtc_setwidth(REG8 width40) {
 
-	(void)port;
-	return(crtc.s.BLACKPAL);
+	crtc.s.width40 = width40;
+	crtc_update();
 }
 
 
 // ----
 
+#if defined(SUPPORT_TURBOZ)
 static void resetpal(void) {
 
 	CopyMemory(crtc.p.text, defpaltext, sizeof(defpaltext));
 	CopyMemory(crtc.p.grph[0], defpalgrph, sizeof(defpalgrph));
 	CopyMemory(crtc.p.grph[1], defpalgrph, sizeof(defpalgrph));
 }
+#endif
 
+#if defined(SUPPORT_TURBOZ)
 void crtc_initialize(void) {
 
 	UINT	p;
@@ -432,25 +563,28 @@ void crtc_initialize(void) {
 		crtc.p.grph4096[p] = p;
 	}
 }
+#endif
 
 void crtc_reset(void) {
 
 	ZeroMemory(&crtc, sizeof(crtc));
 	CopyMemory(crtc.s.rgbp, defrgbp, 4);
 	CopyMemory(crtc.s.reg, defreg, 18);
+	crtc.s.width40 = 1;
+#if defined(SUPPORT_TURBOZ)
 	if (pccore.ROM_TYPE < 3) {
 		resetpal();
 	}
-	if ((pccore.ROM_TYPE >= 2) && (!(pccore.DIP_SW & 1))) {
-		crtc.s.SCRN_BITS = SCRN_200LINE;
-		crtc.s.reg[CRTCREG_CHRCY] = 15;
-	}
+#endif
+//	IPLが勝手に切り替える筈である
+//	if ((pccore.ROM_TYPE >= 2) && (!(pccore.DIP_SW & 1))) {
+//		crtc.s.SCRN_BITS = SCRN_200LINE;
+//		crtc.s.reg[CRTCREG_CHRCY] = 15;
+//	}
 
 	pal_reset();
-	crtc_bankupdate();
-	crtc_regupdate();
 	makescrn.palandply = 1;
-	scrnallflash = 1;
+	crtc_update();
 }
 
 void crtc_forcesetwidth(REG8 width) {