--- np2/pccore.c 2003/12/21 16:05:25 1.34 +++ np2/pccore.c 2003/12/28 08:05:18 1.38 @@ -84,8 +84,6 @@ void getbiospath(char *path, const char const char *p; p = np2cfg.biospath; - - p = np2cfg.biospath; if (p[0]) { file_cpyname(path, p, maxlen); file_setseparator(path, maxlen); @@ -317,6 +315,7 @@ void pccore_reset(void) { cbuscore_reset(); fmboard_reset(np2cfg.SOUND_SW); + i286_memorymap((pc.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -551,6 +550,9 @@ void pccore_exec(BOOL draw) { pic_irq(); if (CPU_RESETREQ) { CPU_RESETREQ = 0; +#if 1 + CPU_SHUT(); +#else CPU_CS = 0xf000; CS_BASE = 0xf0000; CPU_IP = 0xfff0; @@ -558,6 +560,7 @@ void pccore_exec(BOOL draw) { CPU_DX = 0x0300; #endif CPU_CLEARPREFETCH(); +#endif } #if 1 // ndef TRACE @@ -587,7 +590,7 @@ void pccore_exec(BOOL draw) { #if defined(TRACE) execcnt++; if (execcnt >= 60) { - TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt)); +// TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt)); execcnt = 0; resetcnt = 0; piccnt = 0;