--- np2/pccore.c 2004/02/11 17:39:59 1.65 +++ np2/pccore.c 2004/02/21 04:48:35 1.75 @@ -7,9 +7,11 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" +#include "gdc_sub.h" #include "cbuscore.h" #include "pc9861k.h" #include "mpu98ii.h" +#include "amd98.h" #include "bios.h" #include "biosmem.h" #include "vram.h" @@ -34,6 +36,7 @@ #include "np2ver.h" #include "calendar.h" #include "timing.h" +#include "keystat.h" #include "debugsub.h" @@ -44,7 +47,6 @@ 0, 0, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, {1, 1, 6, 1, 8, 1}, - {{0,}, {0,}}, "VX", PCBASECLOCK25, 4, {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}, @@ -55,7 +57,11 @@ 1, 0x82, 0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f}, 3, 1, 80, 0, 0, - {"", ""}, {"", "", "", ""}, "", "", ""}; + {"", ""}, +#if defined(SUPPORT_SCSI) + {"", "", "", ""}, +#endif + "", "", ""}; PCCORE pccore = { PCBASECLOCK25, 4, 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, @@ -115,7 +121,7 @@ static void pccore_set(void) { } else { pccore.baseclock = PCBASECLOCK20; // 2.0MHz - pccore.cpumode = CPUMODE_8MHz; + pccore.cpumode = CPUMODE_8MHZ; } multiple = np2cfg.multiple; if (multiple == 0) { @@ -126,13 +132,7 @@ static void pccore_set(void) { } pccore.multiple = multiple; pccore.realclock = pccore.baseclock * multiple; -#if 0 - keybrd.xferclock = pccore.realclock / 1920; - gdc.rasterclock = pccore.realclock / 24816; - gdc.hsyncclock = (gdc.rasterclock * 4) / 5; - gdc.dispclock = pccore.realclock * 50 / 3102; - gdc.vsyncclock = pccore.realclock * 5 / 3102; -#endif + // HDDの接続 (I/Oの使用状態が変わるので.. if (np2cfg.dipsw[1] & 0x20) { pccore.hddif |= PCHDD_IDE; @@ -171,9 +171,7 @@ static void sound_init(void) { rate = 0; } sound_create(rate, np2cfg.delayms); -#if defined(SUPPORT_WAVEMIX) - wavemix_initialize(rate); -#endif + fddmtrsnd_initialize(rate); beep_initialize(rate); beep_setvol(np2cfg.BEEP_VOL); tms3631_initialize(rate); @@ -189,15 +187,15 @@ static void sound_init(void) { pcm86gen_initialize(rate); pcm86gen_setvol(np2cfg.vol_pcm); cs4231_initialize(rate); + amd98_initialize(rate); } static void sound_term(void) { soundmng_stop(); -#if defined(SUPPORT_WAVEMIX) - wavemix_deinitialize(); -#endif + amd98_deinitialize(); rhythm_deinitialize(); + fddmtrsnd_deinitialize(); sound_destroy(); } @@ -208,15 +206,15 @@ void pccore_init(void) { pal_initlcdtable(); pal_makelcdpal(); pal_makeskiptable(); - dispsync_init(); + dispsync_initialize(); sxsi_initialize(); - font_init(); + font_initialize(); font_load(np2cfg.fontfile, TRUE); - maketext_init(); - makegrph_init(); - gdcsub_init(); - fddfile_init(); + maketext_initialize(); + makegrph_initialize(); + gdcsub_initialize(); + fddfile_initialize(); sound_init(); @@ -284,7 +282,7 @@ void pccore_reset(void) { sound_init(); } - ZeroMemory(mem, 0x110000); // ver0.28 + ZeroMemory(mem, 0x110000); ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); ZeroMemory(mem + FONT_ADRS, 0x08000); @@ -295,7 +293,7 @@ void pccore_reset(void) { } pccore_set(); - nevent_init(); + nevent_allreset(); CPU_RESET(); CPU_SETEXTSIZE((UINT32)pccore.extmem); @@ -327,9 +325,7 @@ void pccore_reset(void) { sound_changeclock(); beep_changeclock(); sound_reset(); -#if defined(SUPPORT_WAVEMIX) - wavemix_bind(); -#endif + fddmtrsnd_bind(); fddfile_reset2dmode(); bios0x18_16(0x20, 0xe1); @@ -344,13 +340,13 @@ void pccore_reset(void) { cbuscore_bind(); fmboard_bind(); - fddmtr_init(); - calendar_init(); - vram_init(); + fddmtr_initialize(); + calendar_initialize(); + vram_initialize(); pal_change(1); - bios_init(); + bios_initialize(); if (np2cfg.ITF_WORK) { CS_BASE = 0xf0000; @@ -404,7 +400,6 @@ static void drawscreen(void) { gdcs.grphdisp |= GDCSCRN_ALLDRAW2; } } - // ver0.28/pr4 if (gdcs.textdisp & GDCSCRN_EXT) { gdcs.textdisp &= ~GDCSCRN_EXT; dispsync_renewalhorizontal(); @@ -413,8 +408,7 @@ static void drawscreen(void) { screenupdate |= 2; } } - // ver0.28/pr4 - if (gdcs.palchange) { // grphを先に + if (gdcs.palchange) { gdcs.palchange = 0; pal_change(0); screenupdate |= 1; @@ -511,7 +505,7 @@ void screendisp(NEVENTITEM item) { gdc_work(GDCWORK_SLAVE); gdc.vsync = 0; screendispflag = 0; - if (!np2cfg.DISPSYNC) { // ver0.29 + if (!np2cfg.DISPSYNC) { drawscreen(); } pi = &pic.pi[0]; @@ -536,7 +530,7 @@ void screenvsync(NEVENTITEM item) { nevent_set(NEVENT_FLAMES, gdc.vsyncclock, screendisp, NEVENT_RELATIVE); // drawscreenで pccore.vsyncclockが変更される可能性があります - if (np2cfg.DISPSYNC) { // ver0.29 + if (np2cfg.DISPSYNC) { drawscreen(); } (void)item; @@ -545,7 +539,7 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- -// #define IPTRACE (1 << 12) +#define IPTRACE (1 << 12) #if defined(TRACE) && IPTRACE static UINT trpos = 0; @@ -589,7 +583,7 @@ UINT cflg; void pccore_exec(BOOL draw) { drawframe = draw; - keyext_flash(); + keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); @@ -638,7 +632,7 @@ void pccore_exec(BOOL draw) { treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; trpos++; #endif -#if 1 +#if 0 if ((CPU_CS == 0xf800) && (CPU_IP == 0x0B5B)) { TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", mem[0x9000], mem[0x9001], @@ -652,38 +646,11 @@ void pccore_exec(BOOL draw) { CPU_DX, CPU_DS, CPU_DI, mem[0xa3fe0])); } #endif -#if 0 - if ((tr & 2) && (mem[0x0471e] == '\\')) { - TRACEOUT(("DTA BREAK %.4x:%.4x", CPU_CS, CPU_IP)); - TRACEOUT(("0471:000e %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", - mem[0x0471e+0], mem[0x0471e+1], mem[0x0471e+2], mem[0x0471e+3], - mem[0x0471e+4], mem[0x0471e+5], mem[0x0471e+6], mem[0x0471e+7])); - tr -= 2; - } - // DOS6 - if (CPU_CS == 0xffd0) { - if (CPU_IP == 0xc4c2) { - TRACEOUT(("DS:DX = %.4x:%.4x / CX = %.4x", CPU_DS, CPU_DX, CPU_CX)); - } - else if (CPU_IP == 0xc21d) { - TRACEOUT(("-> DS:BX = %.4x:%.4x", CPU_DS, CPU_BX)); - } - } -#endif -#if 0 - if ((CPU_CS == 0x0620) || (CPU_CS == 0x08a0)) { - TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); - } -#endif -#if 1 // VX LIO - if (CPU_CS == 0xf990) { - if (CPU_IP == 0x07BE) { - TRACEOUT(("%d,%d - %d,%d", CPU_BP, CPU_DX, CPU_SI, CPU_DI)); - } - } -#endif - i286x_step(); -// i286c_step(); +// if ((CPU_CS == 0x2516) && (CPU_IP == 0x97B0)) { +// TRACEOUT(("DS = %.4x", CPU_DS)); +// } +// i286x_step(); + i286c_step(); } #endif nevent_progress();