--- np2/pccore.c	2003/10/20 12:08:01	1.6
+++ np2/pccore.c	2003/11/12 15:35:16	1.13
@@ -1,59 +1,50 @@
 #include	"compiler.h"
-#include	"dosio.h"
-#include	"scrnmng.h"
 #include	"soundmng.h"
 #include	"sysmng.h"
 #include	"timemng.h"
-
 #include	"i286.h"
 #include	"memory.h"
+#include	"np2ver.h"
 #include	"pccore.h"
-
 #include	"iocore.h"
 #include	"cbuscore.h"
-
+#include	"pc9861k.h"
+#include	"mpu98ii.h"
+#include	"bios.h"
 #include	"vram.h"
 #include	"scrndraw.h"
+#include	"dispsync.h"
 #include	"palettes.h"
 #include	"maketext.h"
 #include	"maketgrp.h"
 #include	"makegrph.h"
-
 #include	"sound.h"
-#include	"beep.h"
 #include	"fmboard.h"
-#include	"bios.h"
-#include	"timing.h"
-#include	"dialog.h"
+#include	"beep.h"
+#include	"font.h"
+#include	"diskdrv.h"
 #include	"fddfile.h"
 #include	"fdd_mtr.h"
+#include	"sxsi.h"
 #include	"calendar.h"
-#include	"font.h"
-#include	"dispsync.h"
+#include	"timing.h"
 //#include	"hostdrv.h"
-#include	"mpu98ii.h"
-#include	"diskdrv.h"
-#include	"sxsi.h"
-
-#include	"keydisp.h"
-#include	"pc9861k.h"
 
 
-	const char	np2version[] = "ver.0.38";
+	const char	np2version[] = NP2VER_CORE;
 
 	NP2CFG		np2cfg = {
 				PCBASECLOCK25, 4, 0,
 				{0x3e, 0x63, 0x7a},
-				{0x48, 0x05, 0x0c, 0x00, 0x01, 0x00, 0x00, 0x6E},
-				{0x0c, 0x08, 0x0c, 0x06, 0x03, 0x0c},				// ver0.27
+				{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6E},
+				{0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c},
 				{1, 1, 6, 1, 8, 1},
 				0, 4, 32, 22050, 800, 0, 1, 1, 0,
 				0, 0,
-//				0, 0, {1, 2, 2, 1},							// ver0.28
 				0, {0, 0, 0}, 0xd1, 0x7f, 0xd1, 0, 0, 1, 0x82,		// ver0.30
 				1, 80, 3, 1, 1, 0, 0x000000, 0xffffff,
 				0, 0, 0, 0x40, 0,
-				64, 64, 64, 64, 64,									// ver0.27
+				64, 64, 64, 64, 64,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
 				2, 1, 0, 0,
 				{"", ""}, ""};
@@ -70,9 +61,10 @@
 							100, 20,
 							0};
 
-									// on=0, off=1
-	BYTE	dip_default[3] = {0x3e, 0x63, 0x7a};
-	BYTE	msw_default[8] = {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6E};
+//									// on=0, off=1
+//	BYTE	dip_default[3] = {0x3e, 0x63, 0x7a};
+static const BYTE msw_default[8] =
+							{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6E};
 
 	BYTE	screenupdate = 3;
 	int		screendispflag = 1;
@@ -80,12 +72,12 @@
 	BOOL	drawframe;
 	UINT	drawcount = 0;
 
-	BYTE	mem[0x200000];								// ver0.28
+	BYTE	mem[0x200000];
 
 
 // ---------------------------------------------------------------------------
 
-static void setvsyncclock(void) {								// ver0.28
+static void setvsyncclock(void) {
 
 	UINT	vfp;
 	UINT	vbp;
@@ -211,6 +203,8 @@ void pccore_init(void) {
 
 void pccore_term(void) {
 
+	sound_term();
+
 	fdd_eject(0);
 	fdd_eject(1);
 	fdd_eject(2);
@@ -224,8 +218,6 @@ void pccore_term(void) {
 	rs232c_destruct();
 	mpu98ii_destruct();
 
-	sound_term();
-
 	sxsi_trash();
 }
 
@@ -295,7 +287,7 @@ void pccore_reset(void) {
 	cbuscore_bind();
 	fmboard_bind();
 
-	timing_init();
+	timing_reset();
 	fddmtr_init();
 	calendar_init();
 	vram_init();
@@ -496,6 +488,7 @@ void screenvsync(NEVENTITEM item) {
 void pccore_exec(BOOL draw) {
 
 	drawframe = draw;
+	keyext_flash();
 	soundmng_sync();
 	mouseif_sync();
 	pal_eventclear();