np2/pccore.c - diff

Return to pccore.c CVS log

Up to [RetroPC.NET] / np2

Diff for /np2/pccore.c between versions 1.34 and 1.41

version 1.34, 2003/12/21 16:05:25	version 1.41, 2004/01/08 16:29:56
Line 31	Line 31
#include "sxsi.h"	#include "sxsi.h"
#include "calendar.h"	#include "calendar.h"
#include "timing.h"	#include "timing.h"
//#include "hostdrv.h"
#include "debugsub.h"	#include "debugsub.h"
	#if defined(SUPPORT_HOSTDRV)
	// #include "hostdrv.h"
	#endif


const char np2version[] = NP2VER_CORE;	const char np2version[] = NP2VER_CORE;
Line 84 void getbiospath(char *path, const char	Line 86 void getbiospath(char *path, const char
const char *p;	const char *p;

p = np2cfg.biospath;	p = np2cfg.biospath;

p = np2cfg.biospath;
if (p[0]) {	if (p[0]) {
file_cpyname(path, p, maxlen);	file_cpyname(path, p, maxlen);
file_setseparator(path, maxlen);	file_setseparator(path, maxlen);
Line 187 static void sound_init(void) {	Line 187 static void sound_init(void) {
rate = 0;	rate = 0;
}	}
sound_create(rate, np2cfg.delayms);	sound_create(rate, np2cfg.delayms);
	#if defined(SUPPORT_WAVEMIX)
	wavemix_initialize(rate);
	#endif
beep_initialize(rate);	beep_initialize(rate);
beep_setvol(np2cfg.BEEP_VOL);	beep_setvol(np2cfg.BEEP_VOL);
tms3631_initialize(rate);	tms3631_initialize(rate);
Line 201 static void sound_init(void) {	Line 204 static void sound_init(void) {
adpcm_setvol(np2cfg.vol_adpcm);	adpcm_setvol(np2cfg.vol_adpcm);
pcm86gen_initialize(rate);	pcm86gen_initialize(rate);
pcm86gen_setvol(np2cfg.vol_pcm);	pcm86gen_setvol(np2cfg.vol_pcm);
	cs4231_initialize(rate);
}	}

static void sound_term(void) {	static void sound_term(void) {

soundmng_stop();	soundmng_stop();
	#if defined(SUPPORT_WAVEMIX)
	wavemix_deinitialize();
	#endif
rhythm_deinitialize();	rhythm_deinitialize();
sound_destroy();	sound_destroy();
}	}
Line 312 void pccore_reset(void) {	Line 319 void pccore_reset(void) {
nevent_init();	nevent_init();

sound_reset();	sound_reset();
	#if defined(SUPPORT_WAVEMIX)
	wavemix_bind();
	#endif

	if (pc.model & PCMODEL_EPSON) { // RAM ctrl
	CPU_RAM_D000 = 0xffff;
	}

iocore_reset(); // サウンドでpicを呼ぶので…	iocore_reset(); // サウンドでpicを呼ぶので…
cbuscore_reset();	cbuscore_reset();
fmboard_reset(np2cfg.SOUND_SW);	fmboard_reset(np2cfg.SOUND_SW);

	i286_memorymap((pc.model & PCMODEL_EPSON)?1:0);
iocore_build();	iocore_build();
iocore_bind();	iocore_bind();
cbuscore_bind();	cbuscore_bind();
Line 551 void pccore_exec(BOOL draw) {	Line 566 void pccore_exec(BOOL draw) {
pic_irq();	pic_irq();
if (CPU_RESETREQ) {	if (CPU_RESETREQ) {
CPU_RESETREQ = 0;	CPU_RESETREQ = 0;
	#if 1
	CPU_SHUT();
	#else
CPU_CS = 0xf000;	CPU_CS = 0xf000;
CS_BASE = 0xf0000;	CS_BASE = 0xf0000;
CPU_IP = 0xfff0;	CPU_IP = 0xfff0;
Line 558 void pccore_exec(BOOL draw) {	Line 576 void pccore_exec(BOOL draw) {
CPU_DX = 0x0300;	CPU_DX = 0x0300;
#endif	#endif
CPU_CLEARPREFETCH();	CPU_CLEARPREFETCH();
	#endif
}	}

#if 1 // ndef TRACE	#if 1 // ndef TRACE
Line 587 void pccore_exec(BOOL draw) {	Line 606 void pccore_exec(BOOL draw) {
#if defined(TRACE)	#if defined(TRACE)
execcnt++;	execcnt++;
if (execcnt >= 60) {	if (execcnt >= 60) {
TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt));	// TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt));
execcnt = 0;	execcnt = 0;
resetcnt = 0;	resetcnt = 0;
piccnt = 0;	piccnt = 0;

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.34
changed lines
	Added in v.1.41