--- xmil/io/crtc.c	2004/08/18 08:08:13	1.18
+++ xmil/io/crtc.c	2008/06/02 20:07:31	1.20
@@ -1,5 +1,4 @@
 #include	"compiler.h"
-#include	"scrnmng.h"
 #include	"z80core.h"
 #include	"pccore.h"
 #include	"iocore.h"
@@ -49,11 +48,11 @@ static const GDCCLK gdcclk[] = {
 static void crtc_bankupdate(void) {
 
 	if (!(crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)) {
-		crtc.e.gram = gram + GRAM_BANK0;
+		crtc.e.gramacc = gram + GRAM_BANK0;
 		crtc.e.updatebit = UPDATE_VRAM0;
 	}
 	else {
-		crtc.e.gram = gram + GRAM_BANK1;
+		crtc.e.gramacc = gram + GRAM_BANK1;
 		crtc.e.updatebit = UPDATE_VRAM1;
 	}
 }
@@ -92,26 +91,27 @@ static void crtc_dispupdate(void) {
 			updatemask = 0x3ff;
 		}
 	}
-	else {													// Analog mode
+	else {												/* Analog mode */
 		updatemask = 0x3ff;
 		if (!(crtc.s.SCRN_BITS & SCRN_TEXTYx2)) {
 			if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
 				if (crtc.s.width40) {
-					if (crtc.s.SCRN_BITS & SCRN_200LINE) {	// width 40,25,0,2
+					if (crtc.s.SCRN_BITS & SCRN_200LINE) {
+														/* width 40,25,0,2 */
 						dispmode = scrnpage + SCRN64_320x200;
 					}
-					else {									// width 40,25,1,2
+					else {								/* width 40,25,1,2 */
 						dispmode = SCRN64_H320x400;
 					}
 				}
-				else {										// width 80,25,?,2
+				else {									/* width 80,25,?,2 */
 					updatemask = 0x7ff;
 					pal_bank = PAL_HIGHRESO;
 					pal_disp = PAL_HIGHRESO;
 				}
 			}
 			else {
-				if (crtc.s.width40) {						// 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 +
@@ -135,7 +135,7 @@ static void crtc_dispupdate(void) {
 						pal_disp = PAL_4096 + PAL_4096FULL;
 					}
 				}
-				else {										// width 80,25,0,1
+				else {									/* width 80,25,0,1 */
 					updatemask = 0x7ff;
 					dispmode = SCRN_WIDTH80 + SCRN64_L640x200;
 				}
@@ -144,20 +144,21 @@ static void crtc_dispupdate(void) {
 		else {
 			if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
 				if (crtc.s.width40) {
-					if (crtc.s.SCRN_BITS & SCRN_200LINE) {	// width 40,12,0,2
+					if (crtc.s.SCRN_BITS & SCRN_200LINE) {
+														/* width 40,12,0,2 */
 						dispmode = scrnpage + SCRN64_320x100;
 					}
-					else {									// width 40,12,1,2
+					else {								/* width 40,12,1,2 */
 						dispmode = SCRN64_H320x200;
 					}
 				}
-				else {										// width 80,12,?,2
+				else {									/* width 80,12,?,2 */
 					pal_bank = PAL_HIGHRESO;
 					pal_disp = PAL_HIGHRESO;
 				}
 			}
 			else {
-				if (crtc.s.width40) {						// 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 +
@@ -181,7 +182,7 @@ static void crtc_dispupdate(void) {
 						pal_disp = PAL_4096 + PAL_4096FULL;
 					}
 				}
-				else {										// width 80,12,0,1
+				else {									/* width 80,12,0,1 */
 					dispmode = SCRN_WIDTH80 + SCRN64_L640x100;
 				}
 			}
@@ -237,27 +238,35 @@ static void crtc_timingupdate(void) {
 
 	UINT32	fontclock;
 	UINT	yl;
+	SINT32	vsyncstart;
+
+	/* とりあえず…ね */
+	crtc.e.pos = crtc.s.reg[CRTCREG_POSL]
+									+ ((crtc.s.reg[CRTCREG_POSH] & 7) << 8);
 
-	// とりあえず…ね
 	crtc.e.rasterdisp8 = (crtc.e.rasterclock8 * 40) / 56;
 
 	fontclock = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
 	fontclock = (fontclock * crtc.e.rasterclock8) >> 8;
 
-	// YsIIIが yl==0で disp信号見る…なんで？
+	/* 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)
+	iocore.e.dispclock = fontclock * max(yl, 1);
+	vsyncstart = fontclock * ((crtc.s.reg[CRTCREG_VSYNC] & 0x7f) + 1);
+	iocore.e.vsyncstart = vsyncstart;
+#if !defined(MAINFRAMES_OLD)
+	iocore.e.vsyncend = vsyncstart + (((crtc.s.reg[CRTCREG_PULSE] >> 4)
+												* crtc.e.rasterclock8) >> 8);
+	neitem_mainframes(NEVENT_FRAMES);
+#else
+	iocore.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);
+#endif
 }
 
 
-// ---- CRTC
+/* CRTC */
 
 void IOOUTCALL crtc_o(UINT port, REG8 value) {
 
@@ -271,15 +280,15 @@ void IOOUTCALL crtc_o(UINT port, REG8 va
 				crtc.s.reg[crtc.s.regnum] = value;
 				crtc_clkupdate();
 				crtc_timingupdate();
-				makescrn.remakeattr = 1;
-				scrnallflash = 1;
+				crtc.e.remakeattr = 1;
+				crtc.e.scrnallflash = 1;
 			}
 		}
 	}
 }
 
 
-// ---- スクリーンモード
+/* スクリーンモード */
 
 void IOOUTCALL scrn_o(UINT port, REG8 value) {
 
@@ -291,12 +300,11 @@ void IOOUTCALL scrn_o(UINT port, REG8 va
 		crtc_bankupdate();
 	}
 	if (modify & SCRN_DISPCHANGE) {
-//		pal_reset();					// なんで？
-		scrnallflash = 1;
+		crtc.e.scrnallflash = 1;
 		crtc_dispupdate();
 		crtc_clkupdate();
 		crtc_timingupdate();
-		makescrn.palandply = 1;
+		crtc.e.palandply = 1;
 	}
 	(void)port;
 }
@@ -308,13 +316,13 @@ REG8 IOINPCALL scrn_i(UINT port) {
 }
 
 
-// ---- プライオリティ
+/* プライオリティ */
 
 void IOOUTCALL ply_o(UINT port, REG8 value) {
 
 	if (crtc.s.rgbp[CRTC_PLY] != value) {
 		crtc.s.rgbp[CRTC_PLY] = value;
-		makescrn.palandply = 1;
+		crtc.e.palandply = 1;
 #if defined(SUPPORT_PALEVENT)
 		if ((!corestat.vsync) && (palevent.events < SUPPORT_PALEVENT)) {
 			PAL1EVENT *e = palevent.event + palevent.events;
@@ -329,7 +337,7 @@ void IOOUTCALL ply_o(UINT port, REG8 val
 }
 
 
-// ---- パレット
+/* パレット */
 
 void IOOUTCALL palette_o(UINT port, REG8 value) {
 
@@ -346,7 +354,7 @@ void IOOUTCALL palette_o(UINT port, REG8
 		num = (port >> 8) & 3;
 		if (crtc.s.rgbp[num] != value) {
 			crtc.s.rgbp[num] = value;
-			makescrn.palandply = 1;
+			crtc.e.palandply = 1;
 #if defined(SUPPORT_PALEVENT)
 			if ((!corestat.vsync) && (palevent.events < SUPPORT_PALEVENT)) {
 				PAL1EVENT *e = palevent.event + palevent.events;
@@ -364,7 +372,7 @@ void IOOUTCALL palette_o(UINT port, REG8
 			return;
 		}
 		sft = (port >> (8 - 2)) & (3 << 2);
-		if (crtc.e.pal_bank & PAL_4096) {				// use 4096palettes
+		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;
@@ -402,7 +410,7 @@ void IOOUTCALL blackctrl_o(UINT port, RE
 
 	if (crtc.s.rgbp[CRTC_BLACK] != value) {
 		crtc.s.rgbp[CRTC_BLACK] = value;
-		makescrn.palandply = 1;
+		crtc.e.palandply = 1;
 #if defined(SUPPORT_PALEVENT)
 		if ((!corestat.vsync) && (palevent.events < SUPPORT_PALEVENT)) {
 			PAL1EVENT *e = palevent.event + palevent.events;
@@ -423,7 +431,7 @@ REG8 IOINPCALL blackctrl_i(UINT port) {
 }
 
 
-// ---- turboZ
+/* turboZ */
 
 #if defined(SUPPORT_TURBOZ)
 REG8 IOINPCALL ply_i(UINT port) {
@@ -439,7 +447,7 @@ REG8 IOINPCALL palette_i(UINT port) {
 	REG8	sft;
 
 	if ((crtc.s.EXTPALMODE & 0x80) && ((crtc.s.EXTGRPHPAL & 0x88) == 0x88)) {
-		if (crtc.e.pal_bank & PAL_4096) {				// use 4096palettes
+		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;
@@ -534,7 +542,7 @@ REG8 IOINPCALL exttextdisp_i(UINT port) 
 #endif
 
 
-// ----
+/* extension */
 
 void crtc_update(void) {
 
@@ -542,8 +550,8 @@ void crtc_update(void) {
 	crtc_dispupdate();
 	crtc_clkupdate();
 	crtc_timingupdate();
-	makescrn.palandply = 1;
-	scrnallflash = 1;
+	crtc.e.palandply = 1;
+	crtc.e.scrnallflash = 1;
 }
 
 void crtc_setwidth(REG8 width40) {
@@ -553,7 +561,7 @@ void crtc_setwidth(REG8 width40) {
 }
 
 
-// ----
+/* init/reset */
 
 #if defined(SUPPORT_TURBOZ)
 static void resetpal(void) {
@@ -587,14 +595,16 @@ void crtc_reset(void) {
 		resetpal();
 	}
 #endif
-//	IPLが勝手に切り替える筈である
-//	if ((pccore.ROM_TYPE >= 2) && (!(pccore.DIP_SW & 1))) {
-//		crtc.s.SCRN_BITS = SCRN_200LINE;
-//		crtc.s.reg[CRTCREG_CHRCY] = 15;
-//	}
+#if 0
+	/* IPLが勝手に切り替える筈である */
+	if ((pccore.ROM_TYPE >= 2) && (!(pccore.DIP_SW & 1))) {
+		crtc.s.SCRN_BITS = SCRN_200LINE;
+		crtc.s.reg[CRTCREG_CHRCY] = 15;
+	}
+#endif	/* 0 */
 
 	pal_reset();
-	makescrn.palandply = 1;
+	crtc.e.palandply = 1;
 	crtc_update();
 }
 
@@ -602,6 +612,6 @@ void crtc_forcesetwidth(REG8 width) {
 
 	crtc.s.reg[CRTCREG_HDISP] = (UINT8)width;
 	crtc_dispupdate();
-	scrnallflash = 1;
+	crtc.e.scrnallflash = 1;
 }