--- np2/pccore.c 2005/05/20 13:59:45 1.106 +++ np2/pccore.c 2007/11/11 12:46:06 1.108 @@ -75,13 +75,14 @@ const OEMCHAR np2version[] = OEMTEXT(NP2 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, PCBASECLOCK25 * PCBASEMULTIPLE}; + PCSTAT pcstat = {3, TRUE, FALSE, FALSE}; - UINT8 screenupdate = 3; - int screendispflag = 1; - int soundrenewal = 0; - BOOL drawframe; +// UINT8 screenupdate = 3; +// int screendispflag = 1; + UINT8 soundrenewal = 0; +// BOOL drawframe; UINT drawcount = 0; - BOOL hardwarereset = FALSE; +// BOOL hardwarereset = FALSE; // --------------------------------------------------------------------------- @@ -104,54 +105,61 @@ const OEMCHAR *p; // ---- -static void pccore_set(void) { - +static void pccore_set(const NP2CFG *pConfig) +{ UINT8 model; UINT32 multiple; UINT8 extsize; ZeroMemory(&pccore, sizeof(pccore)); model = PCMODEL_VX; - if (!milstr_cmp(np2cfg.model, str_VM)) { + if (!milstr_cmp(pConfig->model, str_VM)) { model = PCMODEL_VM; } - else if (!milstr_cmp(np2cfg.model, str_EPSON)) { + else if (!milstr_cmp(pConfig->model, str_EPSON)) { model = PCMODEL_EPSON | PCMODEL_VM; } pccore.model = model; - if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) { + if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) + { pccore.baseclock = PCBASECLOCK25; // 2.5MHz pccore.cpumode = 0; } - else { + else + { pccore.baseclock = PCBASECLOCK20; // 2.0MHz pccore.cpumode = CPUMODE_8MHZ; } - multiple = np2cfg.multiple; - if (multiple == 0) { + multiple = pConfig->multiple; + if (multiple == 0) + { multiple = 1; } - else if (multiple > 32) { + else if (multiple > 32) + { multiple = 32; } pccore.multiple = multiple; pccore.realclock = pccore.baseclock * multiple; // HDDの接続 (I/Oの使用状態が変わるので.. - if (np2cfg.dipsw[1] & 0x20) { + if (pConfig->dipsw[1] & 0x20) + { pccore.hddif |= PCHDD_IDE; #if defined(SUPPORT_IDEIO) sxsi_setdevtype(0x02, SXSIDEV_CDROM); #endif } - else { + else + { sxsi_setdevtype(0x02, SXSIDEV_NC); } // 拡張メモリ extsize = 0; - if (!(np2cfg.dipsw[2] & 0x80)) { + if (!(pConfig->dipsw[2] & 0x80)) + { extsize = np2cfg.EXTMEM; #if defined(CPUCORE_IA32) extsize = min(extsize, 63); @@ -160,17 +168,19 @@ static void pccore_set(void) { #endif } pccore.extmem = extsize; - CopyMemory(pccore.dipsw, np2cfg.dipsw, 3); + CopyMemory(pccore.dipsw, pConfig->dipsw, 3); // サウンドボードの接続 - pccore.sound = np2cfg.SOUND_SW; + pccore.sound = pConfig->SOUND_SW; // その他CBUSの接続 pccore.device = 0; - if (np2cfg.pc9861enable) { + if (pConfig->pc9861enable) + { pccore.device |= PCCBUS_PC9861K; } - if (np2cfg.mpuenable) { + if (pConfig->mpuenable) + { pccore.device |= PCCBUS_MPU98; } } @@ -179,12 +189,13 @@ static void pccore_set(void) { // -------------------------------------------------------------------------- #if !defined(DISABLE_SOUND) -static void sound_init(void) { - +static void sound_init() +{ UINT rate; rate = np2cfg.samplingrate; - if ((rate != 11025) && (rate != 22050) && (rate != 44100)) { + if ((rate != 11025) && (rate != 22050) && (rate != 44100)) + { rate = 0; } sound_create(rate, np2cfg.delayms); @@ -236,7 +247,7 @@ void pccore_init(void) { fddfile_initialize(); #if !defined(DISABLE_SOUND) - sound_init(); + sound_init(&np2cfg); #endif rs232c_construct(); @@ -303,7 +314,7 @@ void pccore_reset(void) { if (soundrenewal) { soundrenewal = 0; sound_term(); - sound_init(); + sound_init(&np2cfg); } #endif ZeroMemory(mem, 0x110000); @@ -312,11 +323,12 @@ void pccore_reset(void) { ZeroMemory(mem + FONT_ADRS, 0x08000); //メモリスイッチ - for (i=0; i<8; i++) { + for (i=0; i<8; i++) + { mem[0xa3fe2 + i*4] = np2cfg.memsw[i]; } - pccore_set(); + pccore_set(&np2cfg); nevent_allreset(); CPU_RESET(); @@ -355,9 +367,9 @@ void pccore_reset(void) { fddfile_reset2dmode(); bios0x18_16(0x20, 0xe1); - iocore_reset(); // サウンドでpicを呼ぶので… - cbuscore_reset(); - fmboard_reset(pccore.sound); + iocore_reset(&np2cfg); // サウンドでpicを呼ぶので… + cbuscore_reset(&np2cfg); + fmboard_reset(&np2cfg, pccore.sound); MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); @@ -414,7 +426,7 @@ static void drawscreen(void) { gdc_updateclock(); } - if (!drawframe) { + if (!pcstat.drawframe) { return; } if ((gdcs.textdisp & GDCSCRN_EXT) || (gdcs.grphdisp & GDCSCRN_EXT)) { @@ -428,13 +440,13 @@ static void drawscreen(void) { dispsync_renewalhorizontal(); tramflag.renewal |= 1; if (dispsync_renewalmode()) { - screenupdate |= 2; + pcstat.screenupdate |= 2; } } if (gdcs.palchange) { gdcs.palchange = 0; pal_change(0); - screenupdate |= 1; + pcstat.screenupdate |= 1; } if (gdcs.grphdisp & GDCSCRN_EXT) { gdcs.grphdisp &= ~GDCSCRN_EXT; @@ -462,7 +474,7 @@ static void drawscreen(void) { if (gdcs.grphdisp & bit) { (*grphfn)(gdcs.disp, gdcs.grphdisp & bit & GDCSCRN_ALLDRAW2); gdcs.grphdisp &= ~bit; - screenupdate |= 1; + pcstat.screenupdate |= 1; } } else if (gdcs.textdisp & GDCSCRN_ENABLE) { @@ -478,7 +490,7 @@ static void drawscreen(void) { gdcs.grphdisp & GDCSCRN_ALLDRAW); } gdcs.grphdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + pcstat.screenupdate |= 1; } } else { @@ -493,7 +505,7 @@ static void drawscreen(void) { gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); } gdcs.grphdisp &= ~(GDCSCRN_MAKE << 1); - screenupdate |= 1; + pcstat.screenupdate |= 1; } } } @@ -514,11 +526,11 @@ static void drawscreen(void) { maketext40(gdcs.textdisp & GDCSCRN_ALLDRAW); } gdcs.textdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + pcstat.screenupdate |= 1; } } - if (screenupdate) { - screenupdate = scrndraw_draw((UINT8)(screenupdate & 2)); + if (pcstat.screenupdate) { + pcstat.screenupdate = scrndraw_draw((UINT8)(pcstat.screenupdate & 2)); drawcount++; } } @@ -529,7 +541,7 @@ void screendisp(NEVENTITEM item) { gdc_work(GDCWORK_SLAVE); gdc.vsync = 0; - screendispflag = 0; + pcstat.screendispflag = 0; if (!np2cfg.DISPSYNC) { drawscreen(); } @@ -580,14 +592,14 @@ void pccore_postevent(UINT32 event) { // void pccore_exec(BOOL draw) { - drawframe = draw; + pcstat.drawframe = (UINT8)draw; // keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); gdc.vsync = 0; - screendispflag = 1; + pcstat.screendispflag = 1; MEMWAIT_TRAM = np2cfg.wait[0]; MEMWAIT_VRAM = np2cfg.wait[2]; MEMWAIT_GRCG = np2cfg.wait[4]; @@ -595,7 +607,7 @@ void pccore_exec(BOOL draw) { // nevent_get1stevent(); - while(screendispflag) { + while(pcstat.screendispflag) { #if defined(TRACE) resetcnt++; #endif @@ -625,10 +637,10 @@ void pccore_exec(BOOL draw) { diskdrv_callback(); calendar_inc(); S98_sync(); - sound_sync(); // happy! + sound_sync(); - if (hardwarereset) { - hardwarereset = FALSE; + if (pcstat.hardwarereset) { + pcstat.hardwarereset = FALSE; pccore_cfgupdate(); pccore_reset(); }