--- np2/statsave.c 2004/01/25 05:41:28 1.32 +++ np2/statsave.c 2004/03/29 14:19:24 1.40 @@ -8,7 +8,9 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" +#include "gdc_sub.h" #include "cbuscore.h" +#include "ideio.h" #include "sasiio.h" #include "scsiio.h" #include "pc9861k.h" @@ -57,7 +59,6 @@ enum { #if defined(CGWND_FONTPTR) STATFLAG_CGW, #endif - STATFLAG_CLOCK, STATFLAG_COM, STATFLAG_DISK, STATFLAG_DMA, @@ -144,13 +145,8 @@ typedef struct { UINT stat; FILEH fh; UINT secpos; - -// long pos; -// long bak; -// long next; NP2FHDR f; -// NP2FENT p; -} _NP2FFILE, *NP2FFILE, _SFFILEH, *SFFILEH; +} _SFFILEH, *SFFILEH; static SFFILEH statflag_open(const char *filename, char *err, int errlen) { @@ -367,175 +363,6 @@ void statflag_seterr(STFLAGH sfh, const } - - -#if 0 -static int flagopen(NP2FFILE f, const char *filename, ERR_BUF *e) { - - if (f) { - f->fh = file_open(filename); - if (f->fh == FILEH_INVALID) { - return(STATFLAG_FAILURE); - } - if (file_read(f->fh, &f->f, sizeof(NP2FHDR)) - != sizeof(NP2FHDR)) { - file_close(f->fh); - return(STATFLAG_FAILURE); - } - f->pos = sizeof(NP2FHDR); - if (strcmp(f->f.name, np2flagdef.name)) { - file_close(f->fh); - return(STATFLAG_FAILURE); - } - if (strcmp(f->f.vername, np2flagdef.vername)) { -#if 1 - file_close(f->fh); - return(STATFLAG_FAILURE); -#else - return(STATFLAG_VERSION); // 他形式を読むのであれば… -#endif - } - if (f->f.ver != np2flagdef.ver) { -#if 1 - file_close(f->fh); - return(STATFLAG_FAILURE); -#else - return(STATFLAG_VERSION); // 他verを読むのであれば… -#endif - } - return(STATFLAG_SUCCESS); - } - (void)e; - return(STATFLAG_FAILURE); -} - -static int flagcreate(NP2FFILE f, const char *filename) { - - if (f) { - f->fh = file_create(filename); - if (f->fh == FILEH_INVALID) { - return(STATFLAG_FAILURE); - } - if (file_write(f->fh, &np2flagdef, sizeof(NP2FHDR)) - != sizeof(NP2FHDR)) { - file_close(f->fh); - return(STATFLAG_FAILURE); - } - f->pos = sizeof(NP2FHDR); - return(STATFLAG_SUCCESS); - } - return(STATFLAG_FAILURE); -} - -static int flagload_create(NP2FFILE f) { - - if (f) { - ZeroMemory(&f->p, sizeof(NP2FENT)); - if (f->pos & 15) { - f->pos += 15; - f->pos &= ~0xf; - if (file_seek(f->fh, f->pos, 0) != f->pos) { - return(STATFLAG_FAILURE); - } - } - if (file_read(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) { - return(STATFLAG_FAILURE); - } - f->pos += sizeof(NP2FENT); - f->next = f->pos + f->p.size; - return(STATFLAG_SUCCESS); - } - return(STATFLAG_FAILURE); -} - -static int flagload_load(NP2FFILE f, void *buf, UINT size) { - - if (f && buf && size && (file_read(f->fh, buf, size) == size)) { - f->pos += size; - return(STATFLAG_SUCCESS); - } - return(STATFLAG_FAILURE); -} - -static int flagload_close(NP2FFILE f) { - - if (file_seek(f->fh, f->next, 0) != f->next) { - return(STATFLAG_FAILURE); - } - f->pos = f->next; - return(STATFLAG_SUCCESS); -} - -static int flagsave_create(NP2FFILE f, const SFENTRY *t) { - - if (f && t) { - int len; - ZeroMemory(&f->p, sizeof(NP2FENT)); - if (f->pos & 15) { - UINT rem; - rem = 16 - (f->pos & 15); - if (file_write(f->fh, &f->p, rem) != rem) { - return(STATFLAG_FAILURE); - } - f->pos += rem; - } - f->bak = f->pos; - - len = strlen(t->index); - if (len >= 10) { - len = 10; - } - if (len) { - CopyMemory(f->p.index, t->index, len); - } - f->p.ver = t->ver; - if (file_write(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) { - return(STATFLAG_FAILURE); - } - f->pos += sizeof(NP2FENT); - return(STATFLAG_SUCCESS); - } - return(STATFLAG_FAILURE); -} - -static int flagsave_save(NP2FFILE f, void *buf, UINT size) { - - if (f && buf && size && (file_write(f->fh, buf, size) == size)) { - f->pos += size; - f->p.size += size; - return(STATFLAG_SUCCESS); - } - return(STATFLAG_FAILURE); -} - -static int flagsave_close(NP2FFILE f) { - - if (!f) { - goto fs_closeerr; - } - if (file_seek(f->fh, f->bak, 0) != f->bak) { - goto fs_closeerr; - } - if (file_write(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) { - goto fs_closeerr; - } - if (file_seek(f->fh, f->pos, 0) == f->pos) { - return(STATFLAG_SUCCESS); - } - -fs_closeerr: - return(STATFLAG_FAILURE); -} - -static void flagclose(NP2FFILE f) { - - if (f) { - file_close(f->fh); - } -} -#endif - - // ---- common static int flagsave_common(STFLAGH sfh, const SFENTRY *tbl) { @@ -549,19 +376,6 @@ static int flagload_common(STFLAGH sfh, } -// ----- clock - -static int flagload_clock(STFLAGH sfh, const SFENTRY *tbl) { - - int ret; - - ret = statflag_read(sfh, tbl->arg1, tbl->arg2); - sound_changeclock(); - beep_changeclock(); - return(ret); -} - - // ---- memory static int flagsave_mem(STFLAGH sfh, const SFENTRY *tbl) { @@ -1002,58 +816,15 @@ static int flagsave_fm(STFLAGH sfh, cons return(ret); } -static void play_fmreg(BYTE num, UINT reg) { - - UINT chbase; - UINT i; - - chbase = num * 3; - for (i=0x30; i<0xa0; i++) { - opngen_setreg((BYTE)chbase, (BYTE)i, opn.reg[reg + i]); - } - for (i=0xb7; i>=0xa0; i--) { - opngen_setreg((BYTE)chbase, (BYTE)i, opn.reg[reg + i]); - } - for (i=0; i<3; i++) { - opngen_keyon(chbase + i, opngen.keyreg[chbase + i]); - } -} - -static void play_psgreg(PSGGEN psg) { - - BYTE i; - - for (i=0; i<0x0e; i++) { - psggen_setreg(psg, i, ((BYTE *)&psg->reg)[i]); - } -} - static int flagload_fm(STFLAGH sfh, const SFENTRY *t) { int ret; UINT saveflg; OPNKEY opnkey; - UINT fmreg1a; - UINT fmreg1b; - UINT fmreg2a; - UINT fmreg2b; - - opngen_reset(); - psggen_reset(&psg1); - psggen_reset(&psg2); - psggen_reset(&psg3); - rhythm_reset(&rhythm); - adpcm_reset(&adpcm); - pcm86_reset(); - cs4231_reset(); ret = statflag_read(sfh, &usesound, sizeof(usesound)); fmboard_reset(usesound); - fmreg1a = 0x000; - fmreg1b = 0x100; - fmreg2a = 0x200; - fmreg2b = 0x300; switch(usesound) { case 0x01: saveflg = FLAG_MG; @@ -1071,9 +842,6 @@ static int flagload_fm(STFLAGH sfh, 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: @@ -1137,40 +905,16 @@ static int flagload_fm(STFLAGH sfh, cons } if (saveflg & FLAG_CS4231) { ret |= statflag_read(sfh, &cs4231, sizeof(cs4231)); - cs4231.proc = cs4231dec[cs4231.reg.datafmt >> 4]; } - // 復元。 - rhythm_update(&rhythm); + // 復元。 これ移動すること！ adpcm_update(&adpcm); pcm86gen_update(); if (saveflg & FLAG_PCM86) { - fmboard_extenable((BYTE)(pcm86.extfunc & 1)); + fmboard_extenable((REG8)(pcm86.extfunc & 1)); } if (saveflg & FLAG_CS4231) { - fmboard_extenable((BYTE)(cs4231.extfunc & 1)); - } - - if (saveflg & FLAG_FM1A) { - play_fmreg(0, fmreg1a); - } - if (saveflg & FLAG_FM1B) { - play_fmreg(1, fmreg1b); - } - if (saveflg & FLAG_FM2A) { - play_fmreg(2, fmreg2a); - } - if (saveflg & FLAG_FM2B) { - play_fmreg(3, fmreg2b); - } - if (saveflg & FLAG_PSG1) { - play_psgreg(&psg1); - } - if (saveflg & FLAG_PSG2) { - play_psgreg(&psg2); - } - if (saveflg & FLAG_PSG3) { - play_psgreg(&psg3); + fmboard_extenable((REG8)(cs4231.extfunc & 1)); } (void)t; return(ret); @@ -1298,7 +1042,6 @@ static int flagload_disk(STFLAGH sfh, co fdd_set(i, st.path, FTYPE_NONE, st.readonly); } } - sxsi_trash(); for (i=0x00; i<0x02; i++) { ret |= statflag_read(sfh, &st, sizeof(st)); if (st.path[0]) { @@ -1445,7 +1188,6 @@ const SFENTRY *tblterm; ret |= statflag_createsection(sffh, tbl); switch(tbl->type) { case STATFLAG_BIN: - case STATFLAG_CLOCK: case STATFLAG_TERM: ret |= flagsave_common(&sffh->sfh, tbl); break; @@ -1539,7 +1281,6 @@ const SFENTRY *tblterm; #if defined(CGWND_FONTPTR) case STATFLAG_CGW: #endif - case STATFLAG_CLOCK: case STATFLAG_MEM: ret |= flagcheck_versize(&sffh->sfh, tbl); break; @@ -1553,6 +1294,7 @@ const SFENTRY *tblterm; case STATFLAG_EGC: case STATFLAG_EPSON: case STATFLAG_EVT: + case STATFLAG_EXT: case STATFLAG_GIJ: case STATFLAG_FM: #if defined(SUPPORT_HOSTDRV) @@ -1603,25 +1345,23 @@ const SFENTRY *tblterm; rs232c_midipanic(); mpu98ii_midipanic(); pc9861k_midipanic(); + sxsi_trash(); ret |= flagload_common(&sffh->sfh, np2tbl); - nevent_init(); CPU_RESET(); CPU_SETEXTSIZE((UINT32)pccore.extmem); + nevent_allreset(); sound_changeclock(); beep_changeclock(); sound_reset(); -#if defined(SUPPORT_WAVEMIX) - wavemix_bind(); -#endif + fddmtrsnd_bind(); iocore_reset(); // サウンドでpicを呼ぶので… cbuscore_reset(); fmboard_reset(pccore.sound); - done = FALSE; while((!done) && (ret != STATFLAG_FAILURE)) { ret |= statflag_readsection(sffh); @@ -1649,10 +1389,6 @@ const SFENTRY *tblterm; break; #endif - case STATFLAG_CLOCK: - ret |= flagload_clock(&sffh->sfh, tbl); - break; - case STATFLAG_COM: ret |= flagload_com(&sffh->sfh, tbl); break;