np2/pccore.c - diff

Return to pccore.c CVS log

Up to [RetroPC.NET] / np2

Diff for /np2/pccore.c between versions 1.28 and 1.37

version 1.28, 2003/12/08 06:24:03	version 1.37, 2003/12/25 19:26:54
Line 1	Line 1
#include "compiler.h"	#include "compiler.h"
	#include "strres.h"
#include "dosio.h"	#include "dosio.h"
#include "soundmng.h"	#include "soundmng.h"
#include "sysmng.h"	#include "sysmng.h"
#include "timemng.h"	#include "timemng.h"
#include "cpucore.h"	#include "cpucore.h"
#include "memory.h"
#include "np2ver.h"	#include "np2ver.h"
#include "pccore.h"	#include "pccore.h"
#include "iocore.h"	#include "iocore.h"
Line 23	Line 23
#include "sound.h"	#include "sound.h"
#include "fmboard.h"	#include "fmboard.h"
#include "beep.h"	#include "beep.h"
	#include "s98.h"
#include "font.h"	#include "font.h"
#include "diskdrv.h"	#include "diskdrv.h"
#include "fddfile.h"	#include "fddfile.h"
Line 75 static const BYTE msw_default[8] =	Line 76 static const BYTE msw_default[8] =
BOOL drawframe;	BOOL drawframe;
UINT drawcount = 0;	UINT drawcount = 0;

BYTE mem[0x200000];


// ---------------------------------------------------------------------------	// ---------------------------------------------------------------------------

Line 85 void getbiospath(char *path, const char	Line 84 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 137 static void setvsyncclock(void) {	Line 134 static void setvsyncclock(void) {
pc.vsyncclock = cnt - pc.dispclock;	pc.vsyncclock = cnt - pc.dispclock;
}	}

static void setpcclock(UINT base, UINT multiple) {	static void setpcclock(const char *modelstr, UINT base, UINT multiple) {

	UINT8 model;

pc.model = PCMODEL_VX;	model = PCMODEL_VX;
	if (!milstr_cmp(modelstr, str_VM)) {
	model = PCMODEL_VM;
	}
	else if (!milstr_cmp(modelstr, str_EPSON)) {
	model = PCMODEL_EPSON \| PCMODEL_VM;
	}
	pc.model = model;

if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {	if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {
pc.baseclock = PCBASECLOCK25; // 2.5MHz	pc.baseclock = PCBASECLOCK25; // 2.5MHz
Line 298 void pccore_reset(void) {	Line 304 void pccore_reset(void) {
sound_init();	sound_init();
}	}

setpcclock(np2cfg.baseclock, np2cfg.multiple);	setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple);
sound_changeclock();	sound_changeclock();
beep_changeclock();	beep_changeclock();
nevent_init();	nevent_init();
Line 492 void screendisp(NEVENTITEM item) {	Line 498 void screendisp(NEVENTITEM item) {

void screenvsync(NEVENTITEM item) {	void screenvsync(NEVENTITEM item) {

vramop.tramwait = np2cfg.wait[1];	MEMWAIT_TRAM = np2cfg.wait[1];
vramop.vramwait = np2cfg.wait[3];	MEMWAIT_VRAM = np2cfg.wait[3];
vramop.grcgwait = np2cfg.wait[5];	MEMWAIT_GRCG = np2cfg.wait[5];
gdc_work(GDCWORK_MASTER);	gdc_work(GDCWORK_MASTER);
gdc.vsync = 0x20;	gdc.vsync = 0x20;
if (gdc.vsyncint) {	if (gdc.vsyncint) {
Line 529 void pccore_exec(BOOL draw) {	Line 535 void pccore_exec(BOOL draw) {

gdc.vsync = 0;	gdc.vsync = 0;
screendispflag = 1;	screendispflag = 1;
vramop.tramwait = np2cfg.wait[0];	MEMWAIT_TRAM = np2cfg.wait[0];
vramop.vramwait = np2cfg.wait[2];	MEMWAIT_VRAM = np2cfg.wait[2];
vramop.grcgwait = np2cfg.wait[4];	MEMWAIT_GRCG = np2cfg.wait[4];
nevent_set(NEVENT_FLAMES, pc.dispclock, screenvsync, NEVENT_RELATIVE);	nevent_set(NEVENT_FLAMES, pc.dispclock, screenvsync, NEVENT_RELATIVE);

// nevent_get1stevent();	// nevent_get1stevent();
Line 543 void pccore_exec(BOOL draw) {	Line 549 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 550 void pccore_exec(BOOL draw) {	Line 559 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 564 void pccore_exec(BOOL draw) {	Line 574 void pccore_exec(BOOL draw) {
#else	#else
while(CPU_REMCLOCK > 0) {	while(CPU_REMCLOCK > 0) {
TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));	TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
i286_step();	i286x_step();
}	}
#endif	#endif
nevent_progress();	nevent_progress();
Line 573 void pccore_exec(BOOL draw) {	Line 583 void pccore_exec(BOOL draw) {
mpu98ii_callback();	mpu98ii_callback();
diskdrv_callback();	diskdrv_callback();
calendar_inc();	calendar_inc();
	S98_sync();
sound_sync(); // happy!	sound_sync(); // happy!

#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.28
changed lines
	Added in v.1.37