--- np2/statsave.c	2003/10/16 17:57:09	1.1.1.1
+++ np2/statsave.c	2003/10/24 10:58:47	1.12
@@ -12,14 +12,14 @@
 #include	"pc9861k.h"
 #include	"mpu98ii.h"
 #include	"board14.h"
+#include	"bios.h"
 #include	"vram.h"
-#include	"maketext.h"
 #include	"palettes.h"
-#include	"font.h"
+#include	"maketext.h"
 #include	"sound.h"
-#include	"bios.h"
 #include	"fmboard.h"
 #include	"beep.h"
+#include	"font.h"
 #include	"fddfile.h"
 #include	"fdd_mtr.h"
 #include	"sxsi.h"
@@ -38,20 +38,18 @@ typedef struct {
 	char	index[10];
 	UINT16	ver;
 	UINT32	size;
-} NP2FLAGPART_T;
+} NP2FENT;
 
 enum {
 	NP2FLAG_BIN			= 0,
 	NP2FLAG_TERM,
-	NP2FLAG_286,
-	NP2FLAG_CORE,
+	NP2FLAG_CLOCK,
 	NP2FLAG_DMA,
 	NP2FLAG_EGC,
 	NP2FLAG_EXT,
 	NP2FLAG_EVT,
 	NP2FLAG_GIJ,
 	NP2FLAG_FM,
-	NP2FLAG_BEEP,
 	NP2FLAG_MIDI,
 	NP2FLAG_DISK
 };
@@ -74,9 +72,9 @@ typedef struct {
 	int		num;
 } ENUMTBL;
 
-#define	PROCID(a, b, c, d)	(((d) << 24) | ((c) << 16) | ((b) << 8) | (a))
-#define	PROC2NUM(a, b)		proc2num(&(a), b, sizeof(b)/sizeof(PROCTBL))
-#define	NUM2PROC(a, b)		num2proc(&(a), b, sizeof(b)/sizeof(PROCTBL))
+#define	PROCID(a, b, c, d)	(((d) << 24) + ((c) << 16) + ((b) << 8) + (a))
+#define	PROC2NUM(a, b)		proc2num(&(a), (b), sizeof(b)/sizeof(PROCTBL))
+#define	NUM2PROC(a, b)		num2proc(&(a), (b), sizeof(b)/sizeof(PROCTBL))
 
 #include "statsave.tbl"
 
@@ -140,15 +138,15 @@ static BOOL num2proc(void *func, const P
 // ----
 
 typedef struct {
-	FILEH		fh;
-	long		pos;
-	long		bak;
-	long		next;
-	NP2FHDR		f;
-	NP2FLAGPART_T	p;
-} NP2FFILE;
+	FILEH	fh;
+	long	pos;
+	long	bak;
+	long	next;
+	NP2FHDR	f;
+	NP2FENT	p;
+} _NP2FFILE, *NP2FFILE;
 
-static int flagopen(NP2FFILE *f, const char *filename, ERR_BUF *e) {
+static int flagopen(NP2FFILE f, const char *filename, ERR_BUF *e) {
 
 	if (f) {
 		f->fh = file_open(filename);
@@ -187,7 +185,7 @@ static int flagopen(NP2FFILE *f, const c
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagcreate(NP2FFILE *f, const char *filename) {
+static int flagcreate(NP2FFILE f, const char *filename) {
 
 	if (f) {
 		f->fh = file_create(filename);
@@ -205,10 +203,10 @@ static int flagcreate(NP2FFILE *f, const
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagload_create(NP2FFILE *f) {
+static int flagload_create(NP2FFILE f) {
 
 	if (f) {
-		ZeroMemory(&f->p, sizeof(NP2FLAGPART_T));
+		ZeroMemory(&f->p, sizeof(NP2FENT));
 		if (f->pos & 15) {
 			f->pos += 15;
 			f->pos &= ~0xf;
@@ -216,18 +214,17 @@ static int flagload_create(NP2FFILE *f) 
 				return(NP2FLAG_FAILURE);
 			}
 		}
-		if (file_read(f->fh, &f->p, sizeof(NP2FLAGPART_T))
-												!= sizeof(NP2FLAGPART_T)) {
+		if (file_read(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) {
 			return(NP2FLAG_FAILURE);
 		}
-		f->pos += sizeof(NP2FLAGPART_T);
+		f->pos += sizeof(NP2FENT);
 		f->next = f->pos + f->p.size;
 		return(NP2FLAG_SUCCESS);
 	}
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagload_load(NP2FFILE *f, void *buf, UINT size) {
+static int flagload_load(NP2FFILE f, void *buf, UINT size) {
 
 	if (f && buf && size && (file_read(f->fh, buf, size) == size)) {
 		f->pos += size;
@@ -236,7 +233,7 @@ static int flagload_load(NP2FFILE *f, vo
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagload_close(NP2FFILE *f) {
+static int flagload_close(NP2FFILE f) {
 
 	if (file_seek(f->fh, f->next, 0) != f->next) {
 		return(NP2FLAG_FAILURE);
@@ -245,11 +242,11 @@ static int flagload_close(NP2FFILE *f) {
 	return(NP2FLAG_SUCCESS);
 }
 
-static int flagsave_create(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_create(NP2FFILE f, const STENTRY *t) {
 
 	if (f && t) {
 		int		len;
-		ZeroMemory(&f->p, sizeof(NP2FLAGPART_T));
+		ZeroMemory(&f->p, sizeof(NP2FENT));
 		if (f->pos & 15) {
 			UINT rem;
 			rem = 16 - (f->pos & 15);
@@ -268,17 +265,16 @@ static int flagsave_create(NP2FFILE *f, 
 			CopyMemory(f->p.index, t->index, len);
 		}
 		f->p.ver = t->ver;
-		if (file_write(f->fh, &f->p, sizeof(NP2FLAGPART_T))
-												!= sizeof(NP2FLAGPART_T)) {
+		if (file_write(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) {
 			return(NP2FLAG_FAILURE);
 		}
-		f->pos += sizeof(NP2FLAGPART_T);
+		f->pos += sizeof(NP2FENT);
 		return(NP2FLAG_SUCCESS);
 	}
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagsave_save(NP2FFILE *f, void *buf, UINT size) {
+static int flagsave_save(NP2FFILE f, void *buf, UINT size) {
 
 	if (f && buf && size && (file_write(f->fh, buf, size) == size)) {
 		f->pos += size;
@@ -288,7 +284,7 @@ static int flagsave_save(NP2FFILE *f, vo
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagsave_close(NP2FFILE *f) {
+static int flagsave_close(NP2FFILE f) {
 
 	if (!f) {
 		goto fs_closeerr;
@@ -296,8 +292,7 @@ static int flagsave_close(NP2FFILE *f) {
 	if (file_seek(f->fh, f->bak, 0) != f->bak) {
 		goto fs_closeerr;
 	}
-	if (file_write(f->fh, &f->p, sizeof(NP2FLAGPART_T))
-												!= sizeof(NP2FLAGPART_T)) {
+	if (file_write(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) {
 		goto fs_closeerr;
 	}
 	if (file_seek(f->fh, f->pos, 0) == f->pos) {
@@ -308,7 +303,7 @@ fs_closeerr:
 	return(NP2FLAG_FAILURE);
 }
 
-static void flagclose(NP2FFILE *f) {
+static void flagclose(NP2FFILE f) {
 
 	if (f) {
 		file_close(f->fh);
@@ -318,7 +313,7 @@ static void flagclose(NP2FFILE *f) {
 
 // ----
 
-static int flagsave_term(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_term(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -330,7 +325,7 @@ static int flagsave_term(NP2FFILE *f, co
 
 // ----
 
-static int flagsave_common(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_common(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -342,7 +337,7 @@ static int flagsave_common(NP2FFILE *f, 
 	return(ret);
 }
 
-static int flagload_common(NP2FFILE *f, const STENTRY *t) {
+static int flagload_common(NP2FFILE f, const STENTRY *t) {
 
 	return(flagload_load(f, t->arg1, t->arg2));
 }
@@ -350,50 +345,20 @@ static int flagload_common(NP2FFILE *f, 
 
 // -----
 
-static int flagsave_286(NP2FFILE *f, const STENTRY *t) {
-
-	int		ret;
-
-	ret = flagsave_create(f, t);
-	if (ret != NP2FLAG_FAILURE) {
-		ret |= flagsave_save(f, &i286r, sizeof(I286REGS));
-		ret |= flagsave_save(f, &i286s, sizeof(I286STAT));
-		ret |= flagsave_close(f);
-	}
-	return(ret);
-}
-
-static int flagload_286(NP2FFILE *f, const STENTRY *t) {
-
-	int		ret;
-
-	ret = flagload_load(f, &i286r, sizeof(I286REGS));
-	ret |= flagload_load(f, &i286s, sizeof(I286STAT));
-	(void)t;
-	return(ret);
-}
-
-
-// -----
-
-static int flagload_core(NP2FFILE *f, const STENTRY *t) {
+static int flagload_clock(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
 	ret = flagload_common(f, t);
-	if (opna_rate) {
-		pc.sampleclock = (pc.realclock / opna_rate) + 1;
-	}
-	else {
-		pc.sampleclock = 0;
-	}
+	sound_changeclock();
+	beep_changeclock();
 	return(ret);
 }
 
 
 // -----
 
-static int flagsave_dma(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_dma(NP2FFILE f, const STENTRY *t) {
 
 	int			ret;
 	int			i;
@@ -415,7 +380,7 @@ static int flagsave_dma(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_dma(NP2FFILE *f, const STENTRY *t) {
+static int flagload_dma(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -443,7 +408,7 @@ static int flagload_dma(NP2FFILE *f, con
 
 // -----
 
-static int flagsave_egc(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_egc(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	_EGC	egcbak;
@@ -460,7 +425,7 @@ static int flagsave_egc(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_egc(NP2FFILE *f, const STENTRY *t) {
+static int flagload_egc(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -474,7 +439,7 @@ static int flagload_egc(NP2FFILE *f, con
 
 // -----
 
-static int flagsave_ext(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_ext(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -489,7 +454,7 @@ static int flagsave_ext(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_ext(NP2FFILE *f, const STENTRY *t) {
+static int flagload_ext(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -526,9 +491,6 @@ static int flagload_ext(NP2FFILE *f, con
 // -----
 
 typedef struct {
-	SINT32		remainclock;
-	SINT32		baseclock;
-	UINT32		clock;
 	UINT		readyevents;
 	UINT		waitevents;
 } NEVTSAVE;
@@ -540,10 +502,10 @@ typedef struct {
 	NEVENTCB	proc;
 } NEVTITEM;
 
-static int nevent_save(NP2FFILE *f, int num) {
+static int nevent_save(NP2FFILE f, int num) {
 
 	NEVTITEM	nit;
-	int			i;
+	UINT		i;
 
 	ZeroMemory(&nit, sizeof(nit));
 	for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) {
@@ -561,15 +523,12 @@ static int nevent_save(NP2FFILE *f, int 
 	return(flagsave_save(f, &nit, sizeof(nit)));
 }
 
-static int flagsave_evt(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_evt(NP2FFILE f, const STENTRY *t) {
 
 	NEVTSAVE	nevt;
 	int			ret;
 	UINT		i;
 
-	nevt.remainclock = nevent.remainclock;
-	nevt.baseclock = nevent.baseclock;
-	nevt.clock = nevent.clock;
 	nevt.readyevents = nevent.readyevents;
 	nevt.waitevents = nevent.waitevents;
 
@@ -587,7 +546,7 @@ static int flagsave_evt(NP2FFILE *f, con
 	return(ret);
 }
 
-static int nevent_load(NP2FFILE *f, UINT *tbl, UINT *pos) {
+static int nevent_load(NP2FFILE f, UINT *tbl, UINT *pos) {
 
 	int			ret;
 	NEVTITEM	nit;
@@ -620,7 +579,7 @@ static int nevent_load(NP2FFILE *f, UINT
 	return(ret);
 }
 
-static int flagload_evt(NP2FFILE *f, const STENTRY *t) {
+static int flagload_evt(NP2FFILE f, const STENTRY *t) {
 
 	int			ret;
 	NEVTSAVE	nevt;
@@ -628,9 +587,6 @@ static int flagload_evt(NP2FFILE *f, con
 
 	ret = flagload_load(f, &nevt, sizeof(nevt));
 
-	nevent.remainclock = nevt.remainclock;
-	nevent.baseclock = nevt.baseclock;
-	nevent.clock = nevt.clock;
 	nevent.readyevents = 0;
 	nevent.waitevents = 0;
 
@@ -647,7 +603,7 @@ static int flagload_evt(NP2FFILE *f, con
 
 // ----
 
-static int flagsave_gij(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_gij(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -668,7 +624,7 @@ static int flagsave_gij(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_gij(NP2FFILE *f, const STENTRY *t) {
+static int flagload_gij(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -709,7 +665,7 @@ typedef struct {
 	BYTE	extop[4];
 } OPNKEY;
 
-static int flagsave_fm(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_fm(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	UINT	saveflg;
@@ -769,7 +725,7 @@ static int flagsave_fm(NP2FFILE *f, cons
 		if (saveflg & FLAG_FM1A) {
 			ret |= flagsave_save(f, &fmtimer, sizeof(fmtimer));
 			ret |= flagsave_save(f, &opn, sizeof(opn));
-			CopyMemory(opnkey.keyreg, fm_keyreg, sizeof(fm_keyreg));
+			CopyMemory(opnkey.keyreg, opngen.keyreg, sizeof(opngen.keyreg));
 			opnkey.extop[0] = opnch[2].extop;
 			opnkey.extop[1] = opnch[5].extop;
 			opnkey.extop[2] = opnch[8].extop;
@@ -811,7 +767,7 @@ static void play_fmreg(BYTE num) {
 		opngen_setreg((BYTE)chbase, (BYTE)i, opn.reg[reg + i]);
 	}
 	for (i=0; i<3; i++) {
-		opngen_keyon(chbase + i, fm_keyreg[chbase + i]);
+		opngen_keyon(chbase + i, opngen.keyreg[chbase + i]);
 	}
 }
 
@@ -824,7 +780,7 @@ static void play_psgreg(PSGGEN psg) {
 	}
 }
 
-static int flagload_fm(NP2FFILE *f, const STENTRY *t) {
+static int flagload_fm(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	UINT	saveflg;
@@ -882,6 +838,7 @@ static int flagload_fm(NP2FFILE *f, cons
 			break;
 
 		default:
+			saveflg = 0;
 			break;
 	}
 
@@ -894,7 +851,7 @@ static int flagload_fm(NP2FFILE *f, cons
 		ret |= flagload_load(f, &fmtimer, sizeof(fmtimer));
 		ret |= flagload_load(f, &opn, sizeof(opn));
 		ret |= flagload_load(f, &opnkey, sizeof(opnkey));
-		CopyMemory(fm_keyreg, &opnkey.keyreg, sizeof(fm_keyreg));
+		CopyMemory(opngen.keyreg, &opnkey.keyreg, sizeof(opngen.keyreg));
 		opnch[2].extop = opnkey.extop[0];
 		opnch[5].extop = opnkey.extop[1];
 		opnch[8].extop = opnkey.extop[2];
@@ -960,7 +917,7 @@ typedef struct {
 	DOSTIME	time;
 } STATDISK;
 
-static int disksave(NP2FFILE *f, const char *path, int readonly) {
+static int disksave(NP2FFILE f, const char *path, int readonly) {
 
 	STATDISK	st;
 	FILEH		fh;
@@ -978,7 +935,7 @@ static int disksave(NP2FFILE *f, const c
 	return(flagsave_save(f, &st, sizeof(st)));
 }
 
-static int flagsave_disk(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_disk(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	BYTE	i;
@@ -1000,7 +957,7 @@ static int flagsave_disk(NP2FFILE *f, co
 	return(ret);
 }
 
-static int diskcheck(NP2FFILE *f, const char *name, ERR_BUF *e) {
+static int diskcheck(NP2FFILE f, const char *name, ERR_BUF *e) {
 
 	int			ret;
 	FILEH		fh;
@@ -1031,7 +988,7 @@ static int diskcheck(NP2FFILE *f, const 
 	return(ret);
 }
 
-static int flagcheck_disk(NP2FFILE *f, const STENTRY *t, ERR_BUF *e) {
+static int flagcheck_disk(NP2FFILE f, const STENTRY *t, ERR_BUF *e) {
 
 	int		ret;
 	int		i;
@@ -1055,7 +1012,7 @@ static int flagcheck_disk(NP2FFILE *f, c
 	return(ret);
 }
 
-static int flagload_disk(NP2FFILE *f, const STENTRY *t) {
+static int flagload_disk(NP2FFILE f, const STENTRY *t) {
 
 	int			ret;
 	BYTE		i;
@@ -1091,7 +1048,7 @@ static int flagload_disk(NP2FFILE *f, co
 // -----
 
 #ifdef _MIDICH
-static int flagsave_midi(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_midi(NP2FFILE f, const STENTRY *t) {
 
 	UINT	device;
 	COMMNG	cm;
@@ -1123,7 +1080,7 @@ static int flagsave_midi(NP2FFILE *f, co
 	return(ret);
 }
 
-static int flagload_midi(NP2FFILE *f, const STENTRY *t) {
+static int flagload_midi(NP2FFILE f, const STENTRY *t) {
 
 	_MIDICH	mch[16];
 	UINT	device;
@@ -1161,7 +1118,7 @@ static int flagload_midi(NP2FFILE *f, co
 
 // ----
 
-static int flagcheck_versize(NP2FFILE *f, const STENTRY *t, ERR_BUF *e) {
+static int flagcheck_versize(NP2FFILE f, const STENTRY *t, ERR_BUF *e) {
 
 	if ((f) && (t)) {
 		if ((f->p.ver == t->ver) && (f->p.size == t->arg2)) {
@@ -1173,7 +1130,7 @@ static int flagcheck_versize(NP2FFILE *f
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagcheck_veronly(NP2FFILE *f, const STENTRY *t, ERR_BUF *e) {
+static int flagcheck_veronly(NP2FFILE f, const STENTRY *t, ERR_BUF *e) {
 
 	if ((f) && (t)) {
 		if (f->p.ver == t->ver) {
@@ -1190,9 +1147,9 @@ static int flagcheck_veronly(NP2FFILE *f
 
 int statsave_save(const char *filename) {
 
-	NP2FFILE	f;
+	_NP2FFILE	f;
 	int			ret;
-	int			i;
+	UINT		i;
 
 	ret = flagcreate(&f, filename);
 	if (ret == NP2FLAG_FAILURE) {
@@ -1201,8 +1158,7 @@ int statsave_save(const char *filename) 
 	for (i=0; i<sizeof(np2tbl)/sizeof(STENTRY); i++) {
 		switch(np2tbl[i].type) {
 			case NP2FLAG_BIN:
-			case NP2FLAG_CORE:
-			case NP2FLAG_BEEP:
+			case NP2FLAG_CLOCK:
 				ret |= flagsave_common(&f, &np2tbl[i]);
 				break;
 
@@ -1210,10 +1166,6 @@ int statsave_save(const char *filename) 
 				ret |= flagsave_term(&f, &np2tbl[i]);
 				break;
 
-			case NP2FLAG_286:
-				ret |= flagsave_286(&f, &np2tbl[i]);
-				break;
-
 			case NP2FLAG_DMA:
 				ret |= flagsave_dma(&f, &np2tbl[i]);
 				break;
@@ -1255,9 +1207,9 @@ int statsave_save(const char *filename) 
 
 int statsave_check(const char *filename, char *buf, int size) {
 
-	NP2FFILE	f;
+	_NP2FFILE	f;
 	int			ret;
-	int			i;
+	UINT		i;
 	BOOL		done;
 	ERR_BUF		e;
 
@@ -1289,6 +1241,7 @@ int statsave_check(const char *filename,
 			if (i < (sizeof(np2tbl)/sizeof(STENTRY))) {
 				switch(np2tbl[i].type) {
 					case NP2FLAG_BIN:
+					case NP2FLAG_CLOCK:
 						ret |= flagcheck_versize(&f, &np2tbl[i], &e);
 						break;
 
@@ -1296,14 +1249,11 @@ int statsave_check(const char *filename,
 						done = TRUE;
 						break;
 
-					case NP2FLAG_286:
-					case NP2FLAG_CORE:
 					case NP2FLAG_DMA:
 					case NP2FLAG_EGC:
 					case NP2FLAG_EXT:
 					case NP2FLAG_EVT:
 					case NP2FLAG_GIJ:
-					case NP2FLAG_BEEP:
 #if defined(MIDICH)
 					case NP2FLAG_MIDI:
 #endif
@@ -1337,9 +1287,9 @@ int statsave_check(const char *filename,
 
 int statsave_load(const char *filename) {
 
-	NP2FFILE	f;
+	_NP2FFILE	f;
 	int			ret;
-	int			i;
+	UINT		i;
 	BOOL		done;
 
 	ret = flagopen(&f, filename, NULL);
@@ -1368,7 +1318,6 @@ int statsave_load(const char *filename) 
 		if (i < (sizeof(np2tbl)/sizeof(STENTRY))) {
 			switch(np2tbl[i].type) {
 				case NP2FLAG_BIN:
-				case NP2FLAG_BEEP:
 					ret |= flagload_common(&f, &np2tbl[i]);
 					break;
 
@@ -1376,12 +1325,8 @@ int statsave_load(const char *filename) 
 					done = TRUE;
 					break;
 
-				case NP2FLAG_286:
-					ret |= flagload_286(&f, &np2tbl[i]);
-					break;
-
-				case NP2FLAG_CORE:
-					ret |= flagload_core(&f, &np2tbl[i]);
+				case NP2FLAG_CLOCK:
+					ret |= flagload_clock(&f, &np2tbl[i]);
 					break;
 
 				case NP2FLAG_DMA: