--- np2/pccore.c 2004/01/31 20:05:23 1.61 +++ np2/pccore.c 2004/02/19 06:10:13 1.72 @@ -10,6 +10,7 @@ #include "cbuscore.h" #include "pc9861k.h" #include "mpu98ii.h" +#include "amd98.h" #include "bios.h" #include "biosmem.h" #include "vram.h" @@ -34,6 +35,7 @@ #include "np2ver.h" #include "calendar.h" #include "timing.h" +#include "keystat.h" #include "debugsub.h" @@ -42,8 +44,9 @@ NP2CFG np2cfg = { 0, 1, 0, 32, 0, 0, 0x40, 0, 0, 0, 0, - {0x3e, 0x63, 0x7a}, 0, + {0x3e, 0x73, 0x7b}, 0, 0, 0, {1, 1, 6, 1, 8, 1}, + {{0, {0, }}, {0, {0, }}}, "VX", PCBASECLOCK25, 4, {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}, @@ -54,20 +57,17 @@ 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, + 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, - 4 * PCBASECLOCK25, - 4 * PCBASECLOCK25 * 50 / 3104, - 4 * PCBASECLOCK25 * 5 / 3104, - 4 * PCBASECLOCK25 / 1920, - 4 * PCBASECLOCK25 / 3125, - 100, 20}; + 4 * PCBASECLOCK25}; - // on=0, off=1 -// BYTE dip_default[3] = {0x3e, 0x63, 0x7a}; static const BYTE msw_default[8] = {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}; @@ -99,43 +99,6 @@ const char *p; // ---- -static void setvsyncclock(void) { - - UINT vfp; - UINT vbp; - UINT lf; - UINT disp; - UINT vs; - UINT maxy; - UINT cnt; - - vfp = gdc.m.para[GDC_SYNC + 5] & 0x3f; - if (!vfp) { - vfp = 1; - } - vbp = gdc.m.para[GDC_SYNC + 7] >> 2; - if (!vbp) { - vbp = 1; - } - lf = LOADINTELWORD(gdc.m.para + GDC_SYNC + 6); - lf &= 0x3ff; - if (!lf) { - lf = 1024; - } - disp = vfp + vbp + lf; - vs = LOADINTELWORD(gdc.m.para + GDC_SYNC + 4); - vs = (vs >> 5) & 0x1f; - if (!vs) { - vs = 1; - } - maxy = disp + vs; - cnt = (pccore.realclock * 5) / 282; - pccore.raster = cnt / maxy; - pccore.hsync = (pccore.raster * 4) / 5; - pccore.dispclock = pccore.raster * disp; - pccore.vsyncclock = cnt - pccore.dispclock; -} - static void pccore_set(void) { UINT8 model; @@ -169,13 +132,13 @@ static void pccore_set(void) { } pccore.multiple = multiple; pccore.realclock = pccore.baseclock * multiple; - pccore.raster = pccore.realclock / 24816; - pccore.hsync = (pccore.raster * 4) / 5; - pccore.dispclock = pccore.realclock * 50 / 3102; - pccore.vsyncclock = pccore.realclock * 5 / 3102; - pccore.keyboardclock = pccore.realclock / 1920; - pccore.midiclock = pccore.realclock / 3125; - +#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; @@ -187,6 +150,7 @@ static void pccore_set(void) { extsize = min(np2cfg.EXTMEM, 13); } pccore.extmem = extsize; + CopyMemory(pccore.dipsw, np2cfg.dipsw, 3); // サウンドボードの接続 pccore.sound = np2cfg.SOUND_SW; @@ -213,9 +177,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); @@ -231,15 +193,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(); } @@ -250,15 +212,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(); @@ -326,7 +288,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); @@ -337,7 +299,7 @@ void pccore_reset(void) { } pccore_set(); - nevent_init(); + nevent_allreset(); CPU_RESET(); CPU_SETEXTSIZE((UINT32)pccore.extmem); @@ -369,9 +331,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); @@ -386,13 +346,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; @@ -434,20 +394,18 @@ static void drawscreen(void) { tramflag.renewal |= 1; } - if ((gdcs.textdisp & GDCSCRN_EXT) || // ver0.28 - (gdcs.grphdisp & GDCSCRN_EXT)) { - setvsyncclock(); + if (gdcs.textdisp & GDCSCRN_EXT) { + gdc_updateclock(); } if (drawframe) { - if ((gdcs.textdisp & GDCSCRN_EXT) || // ver0.26 + if ((gdcs.textdisp & GDCSCRN_EXT) || (gdcs.grphdisp & GDCSCRN_EXT)) { if (dispsync_renewalvertical()) { gdcs.textdisp |= GDCSCRN_ALLDRAW2; gdcs.grphdisp |= GDCSCRN_ALLDRAW2; } } - // ver0.28/pr4 if (gdcs.textdisp & GDCSCRN_EXT) { gdcs.textdisp &= ~GDCSCRN_EXT; dispsync_renewalhorizontal(); @@ -456,8 +414,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; @@ -554,7 +511,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]; @@ -576,10 +533,10 @@ void screenvsync(NEVENTITEM item) { gdc.vsyncint = 0; pic_setirq(2); } - nevent_set(NEVENT_FLAMES, pccore.vsyncclock, screendisp, NEVENT_RELATIVE); + nevent_set(NEVENT_FLAMES, gdc.vsyncclock, screendisp, NEVENT_RELATIVE); // drawscreenで pccore.vsyncclockが変更される可能性があります - if (np2cfg.DISPSYNC) { // ver0.29 + if (np2cfg.DISPSYNC) { drawscreen(); } (void)item; @@ -632,7 +589,7 @@ UINT cflg; void pccore_exec(BOOL draw) { drawframe = draw; - keyext_flash(); + keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); @@ -642,7 +599,7 @@ void pccore_exec(BOOL draw) { MEMWAIT_TRAM = np2cfg.wait[0]; MEMWAIT_VRAM = np2cfg.wait[2]; MEMWAIT_GRCG = np2cfg.wait[4]; - nevent_set(NEVENT_FLAMES, pccore.dispclock, screenvsync, NEVENT_RELATIVE); + nevent_set(NEVENT_FLAMES, gdc.dispclock, screenvsync, NEVENT_RELATIVE); // nevent_get1stevent(); @@ -666,7 +623,7 @@ void pccore_exec(BOOL draw) { #endif } -#if 1 // ndef TRACE +#if 0 // ndef TRACE if (CPU_REMCLOCK > 0) { if (!(CPU_TYPE & CPUTYPE_V30)) { CPU_EXEC(); @@ -681,7 +638,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], @@ -718,7 +675,7 @@ void pccore_exec(BOOL draw) { TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); } #endif -#if 1 // VX LIO +#if 0 // VX LIO if (CPU_CS == 0xf990) { if (CPU_IP == 0x07BE) { TRACEOUT(("%d,%d - %d,%d", CPU_BP, CPU_DX, CPU_SI, CPU_DI));