--- np2/statsave.c 2003/10/18 07:28:50 1.4 +++ np2/statsave.c 2003/11/15 07:10:02 1.17 @@ -12,14 +12,15 @@ #include "pc9861k.h" #include "mpu98ii.h" #include "board14.h" +#include "amd98.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" @@ -28,6 +29,18 @@ #include "keydisp.h" +#if defined(MACOS) +#define CRLITERAL "\r" +#define CRCONST str_cr +#elif defined(WIN32) || defined(X11) || defined(SLZAURUS) +#define CRLITERAL "\n" +#define CRCONST str_lf +#else +#define CRLITERAL "\r\n" +#define CRCONST str_crlf +#endif + + typedef struct { char name[16]; char vername[28]; @@ -38,20 +51,19 @@ typedef struct { char index[10]; UINT16 ver; UINT32 size; -} NP2FLAGPART_T; +} NP2FENT; enum { NP2FLAG_BIN = 0, NP2FLAG_TERM, - NP2FLAG_CORE, + NP2FLAG_CLOCK, NP2FLAG_DMA, NP2FLAG_EGC, NP2FLAG_EXT, NP2FLAG_EVT, NP2FLAG_GIJ, NP2FLAG_FM, - NP2FLAG_BEEP, - NP2FLAG_MIDI, + NP2FLAG_COM, NP2FLAG_DISK }; @@ -73,9 +85,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" @@ -90,9 +102,10 @@ typedef struct { static void err_append(ERR_BUF *e, char *buf) { + int len; + if ((e) && (buf)) { if (e->buf) { - int len; len = strlen(buf); if (e->remain >= len) { CopyMemory(e->buf, buf, len); @@ -139,15 +152,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); @@ -186,7 +199,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); @@ -204,10 +217,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; @@ -215,18 +228,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; @@ -235,7 +247,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); @@ -244,11 +256,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); @@ -267,17 +279,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; @@ -287,7 +298,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; @@ -295,8 +306,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) { @@ -307,7 +317,7 @@ fs_closeerr: return(NP2FLAG_FAILURE); } -static void flagclose(NP2FFILE *f) { +static void flagclose(NP2FFILE f) { if (f) { file_close(f->fh); @@ -317,7 +327,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; @@ -329,7 +339,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; @@ -341,7 +351,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)); } @@ -349,24 +359,20 @@ static int flagload_common(NP2FFILE *f, // ----- -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; @@ -388,7 +394,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; @@ -416,7 +422,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; @@ -433,7 +439,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; @@ -447,7 +453,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; @@ -462,7 +468,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; @@ -499,9 +505,6 @@ static int flagload_ext(NP2FFILE *f, con // ----- typedef struct { - SINT32 remainclock; - SINT32 baseclock; - UINT32 clock; UINT readyevents; UINT waitevents; } NEVTSAVE; @@ -513,7 +516,7 @@ typedef struct { NEVENTCB proc; } NEVTITEM; -static int nevent_save(NP2FFILE *f, int num) { +static int nevent_save(NP2FFILE f, int num) { NEVTITEM nit; UINT i; @@ -534,15 +537,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; @@ -560,7 +560,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; @@ -593,7 +593,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; @@ -601,9 +601,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; @@ -620,7 +617,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; @@ -630,7 +627,7 @@ static int flagsave_gij(NP2FFILE *f, con ret = flagsave_create(f, t); if (ret != NP2FLAG_FAILURE) { for (i=0; i<2; i++) { - fnt = font + ((0x56 + (i << 7)) << 4); + fnt = fontrom + ((0x56 + (i << 7)) << 4); for (j=0; j<0x80; j++) { ret |= flagsave_save(f, fnt, 32); fnt += 0x1000; @@ -641,7 +638,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; @@ -650,7 +647,7 @@ static int flagload_gij(NP2FFILE *f, con ret = 0; for (i=0; i<2; i++) { - fnt = font + ((0x56 + (i << 7)) << 4); + fnt = fontrom + ((0x56 + (i << 7)) << 4); for (j=0; j<0x80; j++) { ret |= flagload_load(f, fnt, 32); fnt += 0x1000; @@ -671,10 +668,11 @@ enum { FLAG_FM2B = 0x0010, FLAG_PSG1 = 0x0020, FLAG_PSG2 = 0x0040, - FLAG_RHYTHM = 0x0080, - FLAG_ADPCM = 0x0100, - FLAG_PCM86 = 0x0200, - FLAG_CS4231 = 0x0400 + FLAG_PSG3 = 0x0080, + FLAG_RHYTHM = 0x0100, + FLAG_ADPCM = 0x0200, + FLAG_PCM86 = 0x0400, + FLAG_CS4231 = 0x0800 }; typedef struct { @@ -682,7 +680,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; @@ -727,6 +725,10 @@ static int flagsave_fm(NP2FFILE *f, cons FLAG_PSG1 | FLAG_RHYTHM | FLAG_ADPCM; break; + case 0x80: + saveflg = FLAG_PSG1 | FLAG_PSG2 | FLAG_PSG3; + break; + default: saveflg = 0; break; @@ -755,6 +757,9 @@ static int flagsave_fm(NP2FFILE *f, cons if (saveflg & FLAG_PSG2) { ret |= flagsave_save(f, &psg2.reg, sizeof(PSGREG)); } + if (saveflg & FLAG_PSG3) { + ret |= flagsave_save(f, &psg3.reg, sizeof(PSGREG)); + } if (saveflg & FLAG_ADPCM) { ret |= flagsave_save(f, &adpcm, sizeof(adpcm)); } @@ -769,14 +774,12 @@ static int flagsave_fm(NP2FFILE *f, cons return(ret); } -static void play_fmreg(BYTE num) { +static void play_fmreg(BYTE num, UINT reg) { UINT chbase; - UINT reg; UINT i; chbase = num * 3; - reg = num * 0x100; for (i=0x30; i<0xa0; i++) { opngen_setreg((BYTE)chbase, (BYTE)i, opn.reg[reg + i]); } @@ -797,11 +800,15 @@ 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; OPNKEY opnkey; + UINT fmreg1a; + UINT fmreg1b; + UINT fmreg2a; + UINT fmreg2b; opngen_reset(); psggen_reset(&psg1); @@ -815,6 +822,10 @@ static int flagload_fm(NP2FFILE *f, cons ret = flagload_load(f, &usesound, sizeof(usesound)); fmboard_reset((BYTE)usesound); + fmreg1a = 0x000; + fmreg1b = 0x100; + fmreg2a = 0x200; + fmreg2b = 0x300; switch(usesound) { case 0x01: saveflg = FLAG_MG; @@ -832,6 +843,9 @@ static int flagload_fm(NP2FFILE *f, cons case 0x06: saveflg = FLAG_FM1A | FLAG_FM1B | FLAG_FM2A | FLAG_PSG1 | FLAG_PSG2 | FLAG_RHYTHM | FLAG_PCM86; + fmreg1a = 0x200; // 逆転してるのん… + fmreg1b = 0x000; + fmreg2a = 0x100; break; case 0x08: @@ -854,7 +868,12 @@ static int flagload_fm(NP2FFILE *f, cons FLAG_PSG1 | FLAG_RHYTHM | FLAG_ADPCM; break; + case 0x80: + saveflg = FLAG_PSG1 | FLAG_PSG2 | FLAG_PSG3; + break; + default: + saveflg = 0; break; } @@ -879,6 +898,9 @@ static int flagload_fm(NP2FFILE *f, cons if (saveflg & FLAG_PSG2) { ret |= flagload_load(f, &psg2.reg, sizeof(PSGREG)); } + if (saveflg & FLAG_PSG3) { + ret |= flagload_load(f, &psg3.reg, sizeof(PSGREG)); + } if (saveflg & FLAG_ADPCM) { ret |= flagload_load(f, &adpcm, sizeof(adpcm)); } @@ -902,16 +924,16 @@ static int flagload_fm(NP2FFILE *f, cons } if (saveflg & FLAG_FM1A) { - play_fmreg(0); + play_fmreg(0, fmreg1a); } if (saveflg & FLAG_FM1B) { - play_fmreg(1); + play_fmreg(1, fmreg1b); } if (saveflg & FLAG_FM2A) { - play_fmreg(2); + play_fmreg(2, fmreg2a); } if (saveflg & FLAG_FM2B) { - play_fmreg(3); + play_fmreg(3, fmreg2b); } if (saveflg & FLAG_PSG1) { play_psgreg(&psg1); @@ -919,6 +941,9 @@ static int flagload_fm(NP2FFILE *f, cons if (saveflg & FLAG_PSG2) { play_psgreg(&psg2); } + if (saveflg & FLAG_PSG3) { + play_psgreg(&psg3); + } (void)t; return(ret); } @@ -933,7 +958,13 @@ typedef struct { DOSTIME time; } STATDISK; -static int disksave(NP2FFILE *f, const char *path, int readonly) { +static const char str_fddx[] = "FDD%u"; +static const char str_sasix[] = "SASI%u"; +static const char str_scsix[] = "SCSI%u"; +static const char str_updated[] = "%s: updated" CRLITERAL; +static const char str_notfound[] = "%s: not found" CRLITERAL; + +static int disksave(NP2FFILE f, const char *path, int readonly) { STATDISK st; FILEH fh; @@ -951,7 +982,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; @@ -973,7 +1004,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; @@ -991,20 +1022,20 @@ static int diskcheck(NP2FFILE *f, const if ((memcmp(&st.date, &date, sizeof(date))) || (memcmp(&st.time, &time, sizeof(time)))) { ret |= NP2FLAG_DISKCHG; - SPRINTF(buf, "%s: updated\n", name); + SPRINTF(buf, str_updated, name); err_append(e, buf); } } else { ret |= NP2FLAG_DISKCHG; - SPRINTF(buf, "%s: not found\n", name); + SPRINTF(buf, str_notfound, name); err_append(e, buf); } } 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; @@ -1012,23 +1043,23 @@ static int flagcheck_disk(NP2FFILE *f, c ret = 0; for (i=0; i<4; i++) { - SPRINTF(buf, "FDD%d", i+1); + SPRINTF(buf, str_fddx, i+1); ret |= diskcheck(f, buf, e); } sxsi_flash(); for (i=0; i<2; i++) { - SPRINTF(buf, "SASI%u", i+1); + SPRINTF(buf, str_sasix, i+1); ret |= diskcheck(f, buf, e); } for (i=0; i<2; i++) { - SPRINTF(buf, "SCSI%d", i+1); + SPRINTF(buf, str_scsix, i+1); ret |= diskcheck(f, buf, e); } (void)t; return(ret); } -static int flagload_disk(NP2FFILE *f, const STENTRY *t) { +static int flagload_disk(NP2FFILE f, const STENTRY *t) { int ret; BYTE i; @@ -1063,13 +1094,12 @@ static int flagload_disk(NP2FFILE *f, co // ----- -#ifdef _MIDICH -static int flagsave_midi(NP2FFILE *f, const STENTRY *t) { +static int flagsave_com(NP2FFILE f, const STENTRY *t) { UINT device; COMMNG cm; int ret; - _MIDICH mch[16]; + COMFLAG flag; device = (UINT)t->arg1; switch(device) { @@ -1086,55 +1116,78 @@ static int flagsave_midi(NP2FFILE *f, co break; } ret = NP2FLAG_SUCCESS; - if ((cm != NULL) && (cm->msg(cm, COMMSG_MIDISTATGET, (long)mch))) { - ret = flagsave_create(f, t); - if (ret != NP2FLAG_FAILURE) { - ret |= flagsave_save(f, mch, sizeof(mch)); - ret |= flagsave_close(f); + if (cm) { + flag = (COMFLAG)cm->msg(cm, COMMSG_GETFLAG, 0); + if (flag) { + ret = flagsave_create(f, t); + if (ret != NP2FLAG_FAILURE) { + ret |= flagsave_save(f, flag, flag->size); + ret |= flagsave_close(f); + } + _MFREE(flag); } } return(ret); } -static int flagload_midi(NP2FFILE *f, const STENTRY *t) { +static int flagload_com(NP2FFILE f, const STENTRY *t) { - _MIDICH mch[16]; - UINT device; - COMMNG cm; - int ret; + UINT device; + COMMNG cm; + int ret; + _COMFLAG fhdr; + COMFLAG flag; - ret = flagload_load(f, mch, sizeof(mch)); - if (ret != NP2FLAG_FAILURE) { - device = (UINT)t->arg1; - switch(device) { - case 0: - commng_destroy(cm_mpu98); - cm = commng_create(COMCREATE_MPU98II); - cm_mpu98 = cm; - break; + ret = flagload_load(f, &fhdr, sizeof(fhdr)); + if (ret != NP2FLAG_SUCCESS) { + goto flcom_err1; + } + if (fhdr.size < sizeof(fhdr)) { + goto flcom_err1; + } + flag = (COMFLAG)_MALLOC(fhdr.size, "com stat flag"); + if (flag == NULL) { + goto flcom_err1; + } + CopyMemory(flag, &fhdr, sizeof(fhdr)); + ret |= flagload_load(f, flag + 1, fhdr.size - sizeof(fhdr)); + if (ret != NP2FLAG_SUCCESS) { + goto flcom_err2; + } - case 1: - commng_destroy(cm_rs232c); - cm = commng_create(COMCREATE_SERIAL); - cm_rs232c = cm; - break; + device = (UINT)t->arg1; + switch(device) { + case 0: + commng_destroy(cm_mpu98); + cm = commng_create(COMCREATE_MPU98II); + cm_mpu98 = cm; + break; - default: - cm = NULL; - break; - } - if (cm) { - cm->msg(cm, COMMSG_MIDISTATSET, (long)mch); - } + case 1: + commng_destroy(cm_rs232c); + cm = commng_create(COMCREATE_SERIAL); + cm_rs232c = cm; + break; + + default: + cm = NULL; + break; + } + if (cm) { + cm->msg(cm, COMMSG_SETFLAG, (long)flag); } + +flcom_err2: + _MFREE(flag); + +flcom_err1: return(ret); } -#endif // ---- -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)) { @@ -1146,7 +1199,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) { @@ -1163,7 +1216,7 @@ static int flagcheck_veronly(NP2FFILE *f int statsave_save(const char *filename) { - NP2FFILE f; + _NP2FFILE f; int ret; UINT i; @@ -1174,8 +1227,7 @@ int statsave_save(const char *filename) for (i=0; i