--- np2/statsave.c	2005/03/22 04:03:15	1.47
+++ np2/statsave.c	2011/01/15 18:04:42	1.52
@@ -398,31 +398,31 @@ static int statflag_writepath(STFLAGH sf
 	return(statflag_write(sfh, &sp, sizeof(sp)));
 }
 
-static int statflag_checkpath(STFLAGH sfh, const OEMCHAR *devname) {
+static int statflag_checkpath(STFLAGH sfh, const OEMCHAR *dvname) {
 
 	int			ret;
 	STATPATH	sp;
 	FILEH		fh;
 	OEMCHAR		buf[256];
-	DOSDATE		date;
-	DOSTIME		time;
+	DOSDATE		dosdate;
+	DOSTIME		dostime;
 
 	ret = statflag_read(sfh, &sp, sizeof(sp));
 	if (sp.path[0]) {
 		fh = file_open_rb(sp.path);
 		if (fh != FILEH_INVALID) {
-			file_getdatetime(fh, &date, &time);
+			file_getdatetime(fh, &dosdate, &dostime);
 			file_close(fh);
-			if ((memcmp(&sp.date, &date, sizeof(date))) ||
-				(memcmp(&sp.time, &time, sizeof(time)))) {
+			if ((memcmp(&sp.date, &dosdate, sizeof(dosdate))) ||
+				(memcmp(&sp.time, &dostime, sizeof(dostime)))) {
 				ret |= STATFLAG_DISKCHG;
-				OEMSPRINTF(buf, str_updated, devname);
+				OEMSPRINTF(buf, str_updated, dvname);
 				statflag_seterr(sfh, buf);
 			}
 		}
 		else {
 			ret |= STATFLAG_DISKCHG;
-			OEMSPRINTF(buf, str_notfound, devname);
+			OEMSPRINTF(buf, str_notfound, dvname);
 			statflag_seterr(sfh, buf);
 		}
 	}
@@ -892,7 +892,7 @@ static int flagload_fm(STFLAGH sfh, cons
 	OPNKEY	opnkey;
 
 	ret = statflag_read(sfh, &usesound, sizeof(usesound));
-	fmboard_reset(usesound);
+	fmboard_reset(&np2cfg, usesound);
 
 	switch(usesound) {
 		case 0x01:
@@ -1037,7 +1037,7 @@ static int flagload_fdd(STFLAGH sfh, con
 	for (i=0; i<4; i++) {
 		ret |= statflag_read(sfh, &sp, sizeof(sp));
 		if (sp.path[0]) {
-			fdd_set(i, sp.path, FTYPE_NONE, sp.readonly);
+			fdd_set(i, sp.path, sp.ftype, sp.readonly);
 		}
 	}
 	(void)tbl;
@@ -1456,9 +1456,9 @@ const SFENTRY	*tblterm;
 	sound_reset();
 	fddmtrsnd_bind();
 
-	iocore_reset();								// サウンドでpicを呼ぶので…
-	cbuscore_reset();
-	fmboard_reset(pccore.sound);
+	iocore_reset(&np2cfg);							// サウンドでpicを呼ぶので…
+	cbuscore_reset(&np2cfg);
+	fmboard_reset(&np2cfg, pccore.sound);
 
 	done = FALSE;
 	while((!done) && (ret != STATFLAG_FAILURE)) {
@@ -1551,7 +1551,7 @@ const SFENTRY	*tblterm;
 	statflag_close(sffh);
 
 	// I/O作り直し
-	i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0);
+	MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0);
 	iocore_build();
 	iocore_bind();
 	cbuscore_bind();
@@ -1568,7 +1568,8 @@ const SFENTRY	*tblterm;
 	FONTPTR_LOW = fontrom + cgwindow.low;
 	FONTPTR_HIGH = fontrom + cgwindow.high;
 #endif
-	i286_vram_dispatch(vramop.operate);
+	MEMM_VRAM(vramop.operate);
+	fddmtr_reset();
 	soundmng_play();
 
 	return(ret);