--- xmil/io/crtc.c	2004/08/12 17:57:36	1.9
+++ xmil/io/crtc.c	2004/08/17 09:35:09	1.15
@@ -1,5 +1,6 @@
 #include	"compiler.h"
 #include	"scrnmng.h"
+#include	"z80core.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"vram.h"
@@ -20,36 +21,96 @@ static const UINT16 defpalgrph[64] = {
 				0x550, 0x55a, 0x5f0, 0x5fa, 0xf50, 0xf5a, 0xff0, 0xffa,
 				0x555, 0x55f, 0x5f5, 0x5ff, 0xf55, 0xf5f, 0xff5, 0xfff};
 
-static const CRTCSTAT crtcdefault = {
-				{0xaa, 0xcc, 0xf0, 0x00},	// rgbp
-				0,							// SCRN_BITS
-				0,							// CRTC_NUM
+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};
+
+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;
 
-				7,							// _FNT_YL
-				40,							// TXT_XL
-				25,							// TXT_YL
-				28,							// TXT_YS
+	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;
+}
 
-//				200,						// CRT_YL
-//				232,						// CRT_VS
-//				266,						// CRT_VL
+static void crtc_timingupdate(void) {
 
-				31,							// TXT_VL
-				10,							// TXT_VLA
+	UINT32	fontclock;
+	UINT	yl;
 
-				0,							// TXT_TOP
-//				8,							// fnty
+	// とりあえず…ね
+	crtc.e.rasterdisp8 = (crtc.e.rasterclock8 * 40) / 56;
 
-				0,							// lastpal
+	fontclock = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
+	fontclock = (fontclock * crtc.e.rasterclock8) >> 8;
 
-				0,							// BLACKPAL
-				0,							// EXTPALMODE
-				0,							// EXTGRPHPAL
-				0,							// ZPRY
-	};
+	// 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);
+}
 
-void crtc_bankupdate(void) {
+static void crtc_bankupdate(void) {
 
 	UINT	updatemask;
 	UINT8	dispmode;
@@ -65,12 +126,14 @@ void crtc_bankupdate(void) {
 		crtc.e.updatebit = UPDATE_VRAM0;
 	}
 	dispmode = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
-	pal_bank = pal_disp = PAL_NORMAL;
+	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.TXT_XL == 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;
@@ -80,7 +143,7 @@ void crtc_bankupdate(void) {
 		updatemask = 0x3ff;
 		if (!(crtc.s.SCRN_BITS & SCRN_TEXTYx2)) {
 			if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-				if (crtc.s.TXT_XL == 40) {
+				if (crtc.s.width40) {
 					if (crtc.s.SCRN_BITS & SCRN_200LINE) {	// width 40,25,0,2
 						dispmode |= SCRN64_320x200;
 					}
@@ -94,7 +157,7 @@ void crtc_bankupdate(void) {
 				}
 			}
 			else {
-				if (crtc.s.TXT_XL == 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 |
@@ -125,7 +188,7 @@ void crtc_bankupdate(void) {
 		}
 		else {
 			if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-				if (crtc.s.TXT_XL == 40) {
+				if (crtc.s.width40) {
 					if (crtc.s.SCRN_BITS & SCRN_200LINE) {	// width 40,12,0,2
 						dispmode |= SCRN64_320x100;
 					}
@@ -138,7 +201,7 @@ void crtc_bankupdate(void) {
 				}
 			}
 			else {
-				if (crtc.s.TXT_XL == 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 |
@@ -173,23 +236,6 @@ void crtc_bankupdate(void) {
 	crtc.e.pal_disp = pal_disp;
 }
 
-void crtc_regupdate(void) {
-
-	UINT	fonty;
-
-	fonty = crtc.s._FNT_YL;
-	if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-		fonty >>= 1;
-	}
-	fonty += 1;
-	crtc.e.fonty = fonty;
-	crtc.e.yl = (crtc.s.TXT_YL & 0x7f);
-
-	crtc.e.dl = fonty * crtc.e.yl;
-	crtc.e.vs = fonty * ((crtc.s.TXT_YS & 0x7f) + 1);
-	crtc.e.vl = fonty * ((crtc.s.TXT_VL & 0x7f) + 1) + (crtc.s.TXT_VLA & 0x1f);
-}
-
 
 // ---- CRTC
 
@@ -197,59 +243,19 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 
 	port &= 0xff;
 	if (port == 0) {
-		crtc.s.CRTC_NUM = value;
+		crtc.s.regnum = value;
 	}
 	else if (port == 1) {
-		switch(crtc.s.CRTC_NUM) {
-			case 0x01:
-				if (value <= 40) {
-					crtc.s.TXT_XL = 40;
-				}
-				else {
-					crtc.s.TXT_XL = 80;
-				}
+		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();
-				break;
-
-			case 0x04:
-				crtc.s.TXT_VL = value;
-				break;
-
-			case 0x05:
-				crtc.s.TXT_VLA = value;
-				break;
-
-			case 0x06:
-				crtc.s.TXT_YL = value;
-				break;
-
-			case 0x07:
-				crtc.s.TXT_YS = value;
-				break;
-
-			case 0x09:
-				crtc.s._FNT_YL = value;
-				break;
-
-			case 0x0c:
-				crtc.s.TXT_TOP &= 0xff;
-				crtc.s.TXT_TOP |= (value & 7) << 8;
 				makescrn.remakeattr = 1;
-				break;
-
-			case 0x0d:
-				crtc.s.TXT_TOP &= 0x700;
-				crtc.s.TXT_TOP |= value;
-				makescrn.remakeattr = 1;
-				break;
-
-			default:
-				return;
+				scrnallflash = 1;
+			}
 		}
-//		crtc.s.GRP_XL = crtc.s.TXT_XL << 3;
-//		crtc.s.GRP_YL = 200;
-		crtc_regupdate();
-		scrnallflash = 1;								/* 990220 puni */
 	}
 }
 
@@ -266,7 +272,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;
@@ -469,6 +476,24 @@ REG8 IOINPCALL blackctrl_i(UINT port) {
 
 // ----
 
+void crtc_update(void) {
+
+	crtc_clkupdate();
+	crtc_timingupdate();
+	crtc_bankupdate();
+	makescrn.palandply = 1;
+	scrnallflash = 1;
+}
+
+void crtc_setwidth(REG8 width40) {
+
+	crtc.s.width40 = width40;
+	crtc_update();
+}
+
+
+// ----
+
 static void resetpal(void) {
 
 	CopyMemory(crtc.p.text, defpaltext, sizeof(defpaltext));
@@ -488,25 +513,27 @@ void crtc_initialize(void) {
 
 void crtc_reset(void) {
 
-	crtc.s = crtcdefault;
+	ZeroMemory(&crtc, sizeof(crtc));
+	CopyMemory(crtc.s.rgbp, defrgbp, 4);
+	CopyMemory(crtc.s.reg, defreg, 18);
+	crtc.s.width40 = 1;
 	if (pccore.ROM_TYPE < 3) {
 		resetpal();
 	}
-	if ((pccore.ROM_TYPE >= 2) && (!(pccore.DIP_SW & 1))) {
-		crtc.s.SCRN_BITS = SCRN_200LINE;
-		crtc.s._FNT_YL = 15;
-	}
+//	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) {
 
-	crtc.s.TXT_XL = (UINT8)width;
+	crtc.s.reg[CRTCREG_HDISP] = (UINT8)width;
 	crtc_bankupdate();
 	scrnallflash = 1;
 }