--- xmil/pccore.c	2004/08/04 15:18:25	1.6
+++ xmil/pccore.c	2004/08/05 16:47:26	1.11
@@ -7,14 +7,11 @@
 #include	"z80core.h"
 #include	"pccore.h"
 #include	"iocore.h"
-#include	"x1_io.h"
-#include	"x1_crtc.h"
 #include	"draw.h"
 #include	"sound.h"
 #include	"sndctrl.h"
 #include	"menu.h"
 #include	"font.h"
-#include	"juliet.h"
 #include	"xmilver.h"
 #include	"fddfile.h"
 #include	"calendar.h"
@@ -30,10 +27,9 @@ const OEMCHAR xmilversion[] = OEMTEXT(XM
 							0, 0,
 							0, 0,
 							0, 0, 0,
-							1,
 							1, 0};
 
-	PCCORE		pccore = {250, 0, 1, 1, 0};
+	PCCORE		pccore = {250, 0, 1, 0};
 	BYTE		mMAIN[0x10000];
 	BYTE		mBIOS[0x8000];
 	BYTE		mBANK[16][0x8000];
@@ -42,7 +38,6 @@ const OEMCHAR xmilversion[] = OEMTEXT(XM
 
 	BYTE		*RAM0r;
 	BYTE		*RAM0w;
-	BYTE		lastmem;
 	DWORD		h_cntbase;
 	BRESULT		soundrenewal;
 
@@ -75,23 +70,12 @@ void ipl_load(void) {
 
 
 /***********************************************************************
-	FONT-ROM LOAD
-***********************************************************************/
-
-void fnt_load(void) {
-
-	font_load(NULL, TRUE);
-}
-
-
-/***********************************************************************
 	½é´ü²½
 ***********************************************************************/
 
 BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_SW, BYTE DIP_SW) {
 
 	pccore.HSYNC_CLK = 250;
-	pccore.ROM_SW = 1;
 	pccore.ROM_TYPE = ROM_TYPE;
 	pccore.SOUND_SW = SOUND_SW;
 	pccore.DIP_SW = DIP_SW;
@@ -110,8 +94,8 @@ BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_
 	ipl_load();
 
 	Z80_RESET();
+	iocore_reset();
 
-	lastmem = 0x78;
 	RAM0r = mBIOS;
 	RAM0w = mMAIN;
 	h_cntbase = 0;
@@ -119,18 +103,18 @@ BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_
 
 	calendar_initialize();
 
-	subcpu_reset();
-	ppi_reset();
-	init_crtc();
-
 	cgrom_reset();
 	cmt_reset();
+	crtc_reset();
 	ctc_reset();
 	dmac_reset();
 	fdc_reset();
+	memio_reset();
 	pcg_reset();
+	ppi_reset();
 	sio_reset();
 	sndboard_reset();
+	subcpu_reset();
 	vramio_reset();
 
 	timing_reset();
@@ -144,16 +128,15 @@ BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_
 ***********************************************************************/
 
 static	BYTE	keyintcnt = 0;
-static	BYTE	flame = 0;
-static	BYTE	inttiming = 0;
 
 void pccore_initialize(void) {
 
 	sndctrl_initialize();
 
 	init_draw();
-	fnt_load();
+	font_load(NULL, TRUE);
 
+	crtc_initialize();
 	pcg_initialize();
 	ppi_initialize();
 
@@ -171,6 +154,8 @@ void pccore_reset(void) {
 		sndctrl_deinitialize();
 		sndctrl_initialize();
 	}
+	sound_reset();
+
 	reset_x1(xmilcfg.ROM_TYPE, xmilcfg.SOUND_SW, xmilcfg.DIP_SW);
 	soundmng_play();
 }
@@ -225,25 +210,15 @@ void iptrace_out(void) {
 
 void x1r_exec(void) {
 
-extern	BYTE	disp_flashscreen;
+	REG8	inttiming;
 
 	v_cnt = 0;
 	s_cnt = 0;
 	xmilcfg.DISPSYNC &= 1;
 	inttiming = xmilcfg.CPU8MHz & 1;
-//	TRACEOUT(("*sync"));
 
 	while(s_cnt < 266) {
 		while(h_cnt < pccore.HSYNC_CLK) {
-#if defined(TRACE)
-//			TRACEOUT(("%.4x", Z80_PC));
-//			if (Z80_PC == 0x8198) {
-//				TRACEOUT(("---->sound"));
-//			}
-//			if (Z80_PC == 0x8188) {
-//				TRACEOUT(("-- poll sound"));
-//			}
-#endif
 #if IPTRACE
 			treip[trpos & (IPTRACE - 1)] = Z80_PC;
 			trpos++;
@@ -255,10 +230,10 @@ extern	BYTE	disp_flashscreen;
 		h_cntbase += pccore.HSYNC_CLK;
 		inttiming ^= 2;
 		if (inttiming != 3) {
-			if (xmilcfg.SOUNDPLY) {
-				sound_makesample(pcmbufsize[s_cnt]);
-				juliet2_exec();
-			}
+			sound_makesample(pcmbufsize[s_cnt]);
+//			if (xmilcfg.SOUNDPLY) {
+//				juliet2_exec();
+//			}
 			s_cnt++;
 			x1_ctc_int();
 			if (!((++keyintcnt) & 15)) {
@@ -269,8 +244,7 @@ extern	BYTE	disp_flashscreen;
 			}
 		}
 		v_cnt++;
-		if (crtc.CRT_YL == v_cnt) {
-//			TRACEOUT(("--->sync"));
+		if (crtc.s.CRT_YL == v_cnt) {
 			pcg.r.vsync = 1;
 			if (xmilcfg.DISPSYNC == 1) {
 				xmilcfg.DISPSYNC |= 0x80;
@@ -278,13 +252,8 @@ extern	BYTE	disp_flashscreen;
 			}
 		}
 	}
-	if (++flame >= 60) {
-		flame = 0;
-		calendar_inc();
-	}
-	if (!xmilcfg.SOUNDPLY) {
-		sound_makesample(framesoundcnt);
-	}
+	sound_sync();
+	calendar_inc();
 	if (!(xmilcfg.DISPSYNC & 0x80)) {
 		scrnupdate();
 	}