--- xmil/pccore.c	2004/08/12 11:03:08	1.22
+++ xmil/pccore.c	2004/08/12 20:09:42	1.26
@@ -24,15 +24,15 @@
 
 const OEMCHAR xmilversion[] = OEMTEXT(XMILVER_CORE);
 
-	XMILCFG		xmilcfg = { 2, 0, 1,
+	XMILCFG		xmilcfg = { 2, 1, 0x03,
 							1, 0, 0, 0,
 							22050, 500, 0, 0, 80,
 							0, 0, 0, 0};
 
 	PCCORE		pccore;
 	CORESTAT	corestat;
-	BYTE		mMAIN[0x10000];
-	BYTE		mBIOS[0x8000];
+	UINT8		mMAIN[0x10000];
+	UINT8		mBIOS[0x8000];
 #if defined(SUPPORT_BANKMEM)
 	UINT8		mBANK[16][0x8000];
 #endif
@@ -97,8 +97,6 @@ void pccore_reset(void) {
 		sndctrl_deinitialize();
 		sndctrl_initialize();
 	}
-	sound_reset();
-
 
 	pccore.baseclock = 2000000;
 	pccore.multiple = 2;
@@ -118,12 +116,15 @@ void pccore_reset(void) {
 		scrnmng_setcolormode(FALSE);
 	}
 
-	sound_changeclock();
 	sysmng_cpureset();
 
+	sound_changeclock();
+	sound_reset();
+
 	Z80_RESET();
 	nevent_allreset();
 	ievent_reset();
+	calendar_reset();
 	iocore_reset();
 
 	ipl_load();
@@ -131,21 +132,6 @@ void pccore_reset(void) {
 	RAM0r = mBIOS;
 	RAM0w = mMAIN;
 
-	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();
-
-	calendar_initialize();
 	pal_reset();
 	makescrn_reset();
 	timing_reset();
@@ -187,29 +173,7 @@ void iptrace_out(void) {
 }
 #endif
 
-
 #if 0
-void nvitem_raster(UINT id) {
-
-	nevent_repeat(id);
-	sound_makesample(pcmbufsize[v_cnt]);
-//	x1_ctc_int();
-	if (!((++keyintcnt) & 15)) {
-		x1_sub_int();
-		if (xmilcfg.MOUSE_SW) {
-			sio_int();
-		}
-	}
-	v_cnt++;
-	if (crtc.s.CRT_YL == v_cnt) {
-		pcg.r.vsync = 1;
-		if (xmilcfg.DISPSYNC & 1) {
-			scrnupdate();
-		}
-	}
-}
-#endif
-
 UINT pccore_getraster(UINT *h) {
 
 	SINT32	work;
@@ -225,19 +189,19 @@ UINT pccore_getraster(UINT *h) {
 	}
 	return(vl);
 }
+#endif
 
-void nvitem_vdisp(UINT id) {
+void neitem_disp(UINT id) {
 
 	corestat.vsync = 1;
 	pcg.r.vsync = 1;
 	if (xmilcfg.DISPSYNC & 1) {
 		scrnupdate();
 	}
-	nevent_set(id, (corestat.tl - corestat.vl) * 250,
-											nvitem_vsync, NEVENT_RELATIVE);
+	nevent_set(id, corestat.syncclock, neitem_vsync, NEVENT_RELATIVE);
 }
 
-void nvitem_vsync(UINT id) {
+void neitem_vsync(UINT id) {
 
 	corestat.vsync = 2;
 	(void)id;
@@ -248,14 +212,18 @@ void nvitem_vsync(UINT id) {
 
 void pccore_exec(BRESULT draw) {
 
+	SINT32	frameclock;
+	SINT32	dispclock;
+
 	corestat.drawframe = draw;
 	soundmng_sync();
 
-	corestat.tl = 266 * pccore.multiple / 2;
-	corestat.vl = min(corestat.tl, crtc.s.CRT_YL);
+	frameclock = 266 * RASTER_CLOCK * pccore.multiple / 2;
+	dispclock = min(frameclock, crtc.e.dispclock);
+	corestat.dispclock = dispclock;
+	corestat.syncclock = frameclock - dispclock;
 	corestat.vsync = 0;
-	nevent_set(NEVENT_FRAMES, corestat.vl * 250,
-											nvitem_vdisp, NEVENT_RELATIVE);
+	nevent_set(NEVENT_FRAMES, dispclock, neitem_disp, NEVENT_RELATIVE);
 	do {
 #if !defined(SINGLESTEPONLY)
 		if (CPU_REMCLOCK > 0) {
@@ -276,7 +244,6 @@ void pccore_exec(BRESULT draw) {
 	} while(corestat.vsync < 2);
 
 	scrnupdate();
-	calendar_inc();
 	sound_sync();
 }