--- xmil/io/crtc.c	2004/08/05 04:53:15	1.2
+++ xmil/io/crtc.c	2004/08/12 17:57:36	1.9
@@ -3,17 +3,14 @@
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"vram.h"
-#include	"draw.h"
 #include	"palettes.h"
+#include	"makescrn.h"
 
 
-		BYTE	crtc_TEXTPAL[8];
-		WORD	crtc_GRPHPAL[2][64];
-		WORD	crtc_PAL4096[4096];
-
-static const UINT8 def_TEXTPAL[8] = {
+static const UINT8 defpaltext[8] = {
 				0x00, 0x03, 0x0c, 0x0f, 0x30, 0x33, 0x3c, 0x3f};
-static const UINT16 def_GRPHPAL[64] = {
+
+static const UINT16 defpalgrph[64] = {
 				0x000, 0x00a, 0x0a0, 0x0aa, 0xa00, 0xa0a, 0xaa0, 0xaaa,
 				0x005, 0x00f, 0x0a5, 0x0af, 0xa05, 0xa0f, 0xaa5, 0xaaf,
 				0x050, 0x05a, 0x0f0, 0x0fa, 0xa50, 0xa5a, 0xaf0, 0xafa,
@@ -23,36 +20,25 @@ static const UINT16 def_GRPHPAL[64] = {
 				0x550, 0x55a, 0x5f0, 0x5fa, 0xf50, 0xf5a, 0xff0, 0xffa,
 				0x555, 0x55f, 0x5f5, 0x5ff, 0xf55, 0xf5f, 0xff5, 0xfff};
 
-
 static const CRTCSTAT crtcdefault = {
-				0xaa,						// PAL_B;
-				0xcc,						// PAL_R;
-				0xf0,						// PAL_G;
-				0x00,						// PLY
-				{0, 1, 2, 3, 4, 5, 6, 7},	// TEXT_PAL[8]
+				{0xaa, 0xcc, 0xf0, 0x00},	// rgbp
 				0,							// SCRN_BITS
 				0,							// CRTC_NUM
 
-				0,							// DISP_PAGE
-				8,							// FNT_XL
-				8,							// FNT_YL
+				7,							// _FNT_YL
 				40,							// TXT_XL
 				25,							// TXT_YL
 				28,							// TXT_YS
-				320,						// GRP_XL
-				200,						// GRP_YL
-				0,							// CPU_BANK
-				0,							// CRT_BANK
-
-				200,						// CRT_YL
-				232,						// CRT_VS
-				266,						// CRT_VL
+
+//				200,						// CRT_YL
+//				232,						// CRT_VS
+//				266,						// CRT_VL
 
 				31,							// TXT_VL
 				10,							// TXT_VLA
 
 				0,							// TXT_TOP
-				8,							// fnty
+//				8,							// fnty
 
 				0,							// lastpal
 
@@ -62,20 +48,20 @@ static const CRTCSTAT crtcdefault = {
 				0,							// ZPRY
 	};
 
-	BYTE	dispmode = SCRN64_INVALID;
-	BYTE	pal_bank = PAL_NORMAL;
-	BYTE	pal_disp = PAL_NORMAL;
 
-void vrambank_patch(void) {
+void crtc_bankupdate(void) {
 
 	UINT	updatemask;
+	UINT8	dispmode;
+	UINT8	pal_bank;
+	UINT8	pal_disp;
 
 	if (crtc.s.SCRN_BITS & 0x10) {
-		crtc.e.gram = GRP_RAM + GRAM_BANK1;
+		crtc.e.gram = gram + GRAM_BANK1;
 		crtc.e.updatebit = UPDATE_VRAM1;
 	}
 	else {
-		crtc.e.gram = GRP_RAM + GRAM_BANK0;
+		crtc.e.gram = gram + GRAM_BANK0;
 		crtc.e.updatebit = UPDATE_VRAM0;
 	}
 	dispmode = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
@@ -182,25 +168,26 @@ void vrambank_patch(void) {
 		}
 	}
 	crtc.e.updatemask = updatemask;
+	crtc.e.dispmode = dispmode;
+	crtc.e.pal_bank = pal_bank;
+	crtc.e.pal_disp = pal_disp;
 }
 
-void crtc_updt(void) {
+void crtc_regupdate(void) {
+
+	UINT	fonty;
 
+	fonty = crtc.s._FNT_YL;
 	if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
-		crtc.s.fnty = (crtc.s.FNT_YL >> 1) & 0xfffe;
+		fonty >>= 1;
 	}
-	else {
-		crtc.s.fnty = crtc.s.FNT_YL & 0xfffe;
-	}
-	if (crtc.s.TXT_YL) {
-		crtc.s.CRT_YL = crtc.s.fnty * crtc.s.TXT_YL;
-	}
-	else {
-		crtc.s.CRT_YL = crtc.s.fnty * 1;
-	}
-	crtc.s.CRT_VS = crtc.s.fnty * (crtc.s.TXT_YS + 1);
-	crtc.s.CRT_VL = (crtc.s.TXT_VL + 1) * crtc.s.fnty + crtc.s.TXT_VLA;
-//	TRACEOUT(("set> %d / %d / %d", crtc.s.CRT_YL, crtc.s.CRT_VS, crtc.s.CRT_VL));
+	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);
 }
 
 
@@ -208,10 +195,11 @@ void crtc_updt(void) {
 
 void IOOUTCALL crtc_o(UINT port, REG8 value) {
 
-	if (port == 0x1800) {
+	port &= 0xff;
+	if (port == 0) {
 		crtc.s.CRTC_NUM = value;
 	}
-	else if (port == 0x1801) {
+	else if (port == 1) {
 		switch(crtc.s.CRTC_NUM) {
 			case 0x01:
 				if (value <= 40) {
@@ -220,7 +208,7 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 				else {
 					crtc.s.TXT_XL = 80;
 				}
-				vrambank_patch();
+				crtc_bankupdate();
 				break;
 
 			case 0x04:
@@ -240,27 +228,27 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 				break;
 
 			case 0x09:
-				crtc.s.FNT_YL = (WORD)value+1;
+				crtc.s._FNT_YL = value;
 				break;
 
 			case 0x0c:
 				crtc.s.TXT_TOP &= 0xff;
 				crtc.s.TXT_TOP |= (value & 7) << 8;
-				doubleatrchange = 1;
+				makescrn.remakeattr = 1;
 				break;
 
 			case 0x0d:
-				crtc.s.TXT_TOP &= 0x7ff;
+				crtc.s.TXT_TOP &= 0x700;
 				crtc.s.TXT_TOP |= value;
-				doubleatrchange = 1;
+				makescrn.remakeattr = 1;
 				break;
 
 			default:
 				return;
 		}
-		crtc.s.GRP_XL = crtc.s.TXT_XL << 3;
-		crtc.s.GRP_YL = 200;
-		crtc_updt();
+//		crtc.s.GRP_XL = crtc.s.TXT_XL << 3;
+//		crtc.s.GRP_YL = 200;
+		crtc_regupdate();
 		scrnallflash = 1;								/* 990220 puni */
 	}
 }
@@ -275,15 +263,12 @@ void IOOUTCALL scrn_o(UINT port, REG8 va
 	modify = crtc.s.SCRN_BITS ^ value;
 	crtc.s.SCRN_BITS = value;
 	if (modify & SCRN_DISPCHANGE) {
-		textdrawproc_renewal();
-		reflesh_palette();
+//		pal_reset();					// ¤Ê¤ó¤Ç¡©
 		scrnallflash = 1;
-		palandply = 1;
-		crtc_updt();
+		makescrn.palandply = 1;
+		crtc_regupdate();
 	}
-	vrambank_patch();
-	crtc.s.CPU_BANK = (BYTE)((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)?1:0);
-	crtc.s.CRT_BANK = (BYTE)((crtc.s.SCRN_BITS & SCRN_DISPVRAM)?1:0);
+	crtc_bankupdate();
 	(void)port;
 }
 
@@ -298,9 +283,9 @@ REG8 IOINPCALL scrn_i(UINT port) {
 
 void IOOUTCALL ply_o(UINT port, REG8 value) {
 
-	if (crtc.s.PLY != value) {
-		crtc.s.PLY = value;
-		palandply = 1;
+	if (crtc.s.rgbp[CRTC_PLY] != value) {
+		crtc.s.rgbp[CRTC_PLY] = value;
+		makescrn.palandply = 1;
 	}
 	(void)port;
 }
@@ -308,7 +293,7 @@ void IOOUTCALL ply_o(UINT port, REG8 val
 REG8 IOINPCALL ply_i(UINT port) {
 
 	(void)port;
-	return(crtc.s.PLY);
+	return(crtc.s.rgbp[CRTC_PLY]);
 }
 
 
@@ -316,157 +301,91 @@ REG8 IOINPCALL ply_i(UINT port) {
 
 void IOOUTCALL palette_o(UINT port, REG8 value) {
 
+	REG8	sft;
+	UINT	num;
 	UINT	pal;
-	BYTE	c;
 
 	crtc.s.lastpal = (value & 0xf0);
 	if (crtc.s.EXTPALMODE & 0x80) {
 		if ((crtc.s.EXTGRPHPAL & 0x88) != 0x80) {
 			return;
 		}
-		if (pal_bank & PAL_4096) {					// use 4096palettes
-			switch(pal_bank & (PAL_4096FULL | PAL_4096BANK)) {
-				case 0:
-					pal = ((port & 0xcc) << 4) + ((value & 0xc0) >> 4);
-					break;
-
-				case 1:
-					pal = ((port & 0xcc) << 2) + ((value & 0xc0) >> 6);
-					break;
-
-				default:
-					pal = ((port & 0xff) << 4) + (crtc.s.lastpal >> 4);
-					break;
-			}
-			value &= 0xf;
-			switch(port & 0xff00) {
-				case 0x1000:
-					crtc_PAL4096[pal] &= 0xff0;
-					crtc_PAL4096[pal] |= value;
-					break;
-
-				case 0x1100:
-					crtc_PAL4096[pal] &= 0xf0f;
-					crtc_PAL4096[pal] |= (value << 4);
-					break;
-
-				case 0x1200:
-					crtc_PAL4096[pal] &= 0x0ff;
-					crtc_PAL4096[pal] |= ((WORD)value << 8);
-					break;
+		sft = (port >> (8 - 2)) & (3 << 2);
+		if (crtc.e.pal_bank & PAL_4096) {				// use 4096palettes
+			num = ((port & 0xff) << 4) + (crtc.s.lastpal >> 4);
+			if (!(crtc.e.pal_bank & PAL_4096FULL)) {
+				num &= 0xccc;
+				if (crtc.e.pal_bank & PAL_4096BANK) {
+					num >>= 2;
+				}
 			}
-			pal_setgrph4096(pal);
+			pal = crtc.p.grph4096[num];
+			pal &= ~((0x0f) << sft);
+			pal |= (value & 0x0f) << sft;
+			crtc.p.grph4096[num] = pal;
+			pal_setgrph4096(num);
 		}
 		else {
-			c = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) |
+			num = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) |
 												((value & 0x80) >> 7);
-			if ((dispmode & SCRN64_MASK) == SCRN64_INVALID) {
-				c |= (c << 3);
+			if ((crtc.e.dispmode & SCRN64_MASK) == SCRN64_INVALID) {
+				num |= (num << 3);
 			}
 			else {
-				c += ((port & 0x40) >> 1) | ((port & 0x04) << 2) |
+				num += ((port & 0x40) >> 1) | ((port & 0x04) << 2) |
 													((value & 0x40) >> 3);
 			}
-			value &= 0xf;
-			switch(port & 0xff00) {
-				case 0x1000:
-					crtc_GRPHPAL[pal_bank][c] &= 0xff0;
-					crtc_GRPHPAL[pal_bank][c] |= value;
-					break;
-
-				case 0x1100:
-					crtc_GRPHPAL[pal_bank][c] &= 0xf0f;
-					crtc_GRPHPAL[pal_bank][c] |= (value << 4);
-					break;
-
-				case 0x1200:
-					crtc_GRPHPAL[pal_bank][c] &= 0x0ff;
-					crtc_GRPHPAL[pal_bank][c] |= ((WORD)value << 8);
-					break;
-			}
-			pal_setgrph(pal_bank, c);
+			pal = crtc.p.grph[crtc.e.pal_bank][num];
+			pal &= ~((0x0f) << sft);
+			pal |= (value & 0x0f) << sft;
+			crtc.p.grph[crtc.e.pal_bank][num] = pal;
+			pal_setgrph(crtc.e.pal_bank, (REG8)num);
 		}
 	}
 	else {
-		switch(port & 0xff00) {
-			case 0x1000:
-				if (crtc.s.PAL_B != value) {
-					crtc.s.PAL_B = value;
-					palandply = 1;
-				}
-				break;
-
-			case 0x1100:
-				if (crtc.s.PAL_R != value) {
-					crtc.s.PAL_R = value;
-					palandply = 1;
-				}
-				break;
-
-			case 0x1200:
-				if (crtc.s.PAL_G != value) {
-					crtc.s.PAL_G = value;
-					palandply = 1;
-				}
-				break;
+		num = (port >> 8) & 3;
+		if (crtc.s.rgbp[num] != value) {
+			crtc.s.rgbp[num] = value;
+			makescrn.palandply = 1;
 		}
 	}
 }
 
 REG8 IOINPCALL palette_i(UINT port) {
 
-	UINT	c;
+	UINT	num;
+	UINT	pal;
+	REG8	sft;
 
 	if ((crtc.s.EXTPALMODE & 0x80) && ((crtc.s.EXTGRPHPAL & 0x88) == 0x88)) {
-		if (pal_bank & PAL_4096) {					// use 4096palettes
-			switch(pal_bank & (PAL_4096FULL | PAL_4096BANK)) {
-				case 0:
-					c = ((port & 0xcc) << 4) | ((crtc.s.lastpal & 0xc0) >> 4);
-					break;
-
-				case 1:
-					c = ((port & 0xcc) << 2) | ((crtc.s.lastpal & 0xc0) >> 6);
-					break;
-
-				default:
-					c = ((port & 0xff) << 4) | (crtc.s.lastpal >> 4);
-					break;
-			}
-			switch(port & 0xff00) {
-				case 0x1000:
-					return(crtc.s.lastpal | (crtc_PAL4096[c] & 0xf));
-
-				case 0x1100:
-					return(crtc.s.lastpal | ((crtc_PAL4096[c] & 0xf0) >> 4));
-
-				case 0x1200:
-					return(crtc.s.lastpal | ((crtc_PAL4096[c] & 0xf00) >> 8));
+		if (crtc.e.pal_bank & PAL_4096) {				// use 4096palettes
+			num = ((port & 0xff) << 4) + (crtc.s.lastpal >> 4);
+			if (!(crtc.e.pal_bank & PAL_4096FULL)) {
+				num &= 0xccc;
+				if (crtc.e.pal_bank & PAL_4096BANK) {
+					num >>= 2;
+				}
 			}
+			pal = crtc.p.grph4096[num];
 		}
 		else {
-			c = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) |
+			num = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) |
 											((crtc.s.lastpal & 0x80) >> 7);
-			if ((dispmode & SCRN64_MASK) == SCRN64_INVALID) {
-				c |= (c << 3);
+			if ((crtc.e.dispmode & SCRN64_MASK) == SCRN64_INVALID) {
+				num |= (num << 3);
 			}
 			else {
-				c += ((port & 0x40) >> 1) | ((port & 0x04) << 2) |
+				num += ((port & 0x40) >> 1) | ((port & 0x04) << 2) |
 											((crtc.s.lastpal & 0x40) >> 3);
 			}
-			switch(port & 0xff00) {
-				case 0x1000:
-					return(crtc.s.lastpal |
-								(crtc_GRPHPAL[pal_bank][c] & 0xf));
-				case 0x1100:
-					return(crtc.s.lastpal |
-								((crtc_GRPHPAL[pal_bank][c] & 0xf0) >> 4));
-				case 0x1200:
-					return(crtc.s.lastpal |
-								((crtc_GRPHPAL[pal_bank][c] & 0xf00) >> 8));
-			}
+			pal = crtc.p.grph[crtc.e.pal_bank][num];
 		}
+		sft = (port >> (8 - 2)) & (3 << 2);
+		return((REG8)(crtc.s.lastpal + ((pal >> sft) & 0xf)));
+	}
+	else {
+		return(0xff);
 	}
-	return(0xff);
 }
 
 
@@ -475,11 +394,13 @@ REG8 IOINPCALL palette_i(UINT port) {
 void IOOUTCALL extpal_o(UINT port, REG8 value) {
 
 	crtc.s.EXTPALMODE = value;
-	vrambank_patch();
+	crtc_bankupdate();
+	(void)port;
 }
 
 REG8 IOINPCALL extpal_i(UINT port) {
 
+	(void)port;
 	return(crtc.s.EXTPALMODE);
 }
 
@@ -488,6 +409,7 @@ void IOOUTCALL extgrphpal_o(UINT port, R
 	if (crtc.s.EXTPALMODE & 0x80) {
 		crtc.s.EXTGRPHPAL = value;
 	}
+	(void)port;
 }
 
 REG8 IOINPCALL extgrphpal_i(UINT port) {
@@ -495,13 +417,14 @@ REG8 IOINPCALL extgrphpal_i(UINT port) {
 	if (crtc.s.EXTPALMODE & 0x80) {
 		return(crtc.s.EXTGRPHPAL);
 	}
+	(void)port;
 	return(0xff);
 }
 
 void IOOUTCALL exttextpal_o(UINT port, REG8 value) {
 
 	if (crtc.s.EXTPALMODE & 0x80) {
-		crtc_TEXTPAL[port & 7] = value;
+		crtc.p.text[port & 7] = value;
 		pal_settext((REG8)(port & 7));
 	}
 }
@@ -509,7 +432,7 @@ void IOOUTCALL exttextpal_o(UINT port, R
 REG8 IOINPCALL exttextpal_i(UINT port) {
 
 	if (crtc.s.EXTPALMODE & 0x80) {
-		return(crtc_TEXTPAL[port & 7]);
+		return(crtc.p.text[port & 7]);
 	}
 	return(0xff);
 }
@@ -517,7 +440,8 @@ REG8 IOINPCALL exttextpal_i(UINT port) {
 void IOOUTCALL exttextdisp_o(UINT port, REG8 value) {
 
 	crtc.s.ZPRY = value;
-	vrambank_patch();
+	crtc_bankupdate();
+	(void)port;
 }
 
 REG8 IOINPCALL exttextdisp_i(UINT port) {
@@ -525,17 +449,20 @@ REG8 IOINPCALL exttextdisp_i(UINT port) 
 	if (crtc.s.EXTPALMODE & 0x80) {
 		return(crtc.s.ZPRY);
 	}
+	(void)port;
 	return(0xff);
 }
 
 void IOOUTCALL blackctrl_o(UINT port, REG8 value) {
 
 	crtc.s.BLACKPAL = value;
-	palandply = 1;
+	makescrn.palandply = 1;
+	(void)port;
 }
 
 REG8 IOINPCALL blackctrl_i(UINT port) {
 
+	(void)port;
 	return(crtc.s.BLACKPAL);
 }
 
@@ -544,9 +471,9 @@ REG8 IOINPCALL blackctrl_i(UINT port) {
 
 static void resetpal(void) {
 
-	CopyMemory(crtc_TEXTPAL, def_TEXTPAL, 8);
-	CopyMemory(crtc_GRPHPAL[0], def_GRPHPAL, 64*2);
-	CopyMemory(crtc_GRPHPAL[1], def_GRPHPAL, 64*2);
+	CopyMemory(crtc.p.text, defpaltext, sizeof(defpaltext));
+	CopyMemory(crtc.p.grph[0], defpalgrph, sizeof(defpalgrph));
+	CopyMemory(crtc.p.grph[1], defpalgrph, sizeof(defpalgrph));
 }
 
 void crtc_initialize(void) {
@@ -555,31 +482,32 @@ void crtc_initialize(void) {
 
 	resetpal();
 	for (p=0; p<4096; p++) {
-		crtc_PAL4096[p] = p;
+		crtc.p.grph4096[p] = p;
 	}
 }
 
 void crtc_reset(void) {
 
 	crtc.s = crtcdefault;
-
-	palandply = 1;
-	dispmode = SCRN64_INVALID;
-	pal_bank = pal_disp = PAL_NORMAL;
 	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 = 16;
+		crtc.s._FNT_YL = 15;
 	}
 
-	textdrawproc_renewal();
-	reflesh_palette();
-	crtc_updt();
+	pal_reset();
+	crtc_bankupdate();
+	crtc_regupdate();
+	makescrn.palandply = 1;
+	scrnallflash = 1;
+}
+
+void crtc_forcesetwidth(REG8 width) {
 
-	vrambank_patch();
-	palandply = 1;
+	crtc.s.TXT_XL = (UINT8)width;
+	crtc_bankupdate();
 	scrnallflash = 1;
 }