np2/pccore.c - diff

Return to pccore.c CVS log

Up to [RetroPC.NET] / np2

Diff for /np2/pccore.c between versions 1.105 and 1.107

version 1.105, 2005/04/04 11:50:58	version 1.107, 2007/11/03 00:00:18
Line 104 const OEMCHAR *p;	Line 104 const OEMCHAR *p;

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

static void pccore_set(void) {	static void pccore_set(const NP2CFG *pConfig)
	{
UINT8 model;	UINT8 model;
UINT32 multiple;	UINT32 multiple;
UINT8 extsize;	UINT8 extsize;

ZeroMemory(&pccore, sizeof(pccore));	ZeroMemory(&pccore, sizeof(pccore));
model = PCMODEL_VX;	model = PCMODEL_VX;
if (!milstr_cmp(np2cfg.model, str_VM)) {	if (!milstr_cmp(pConfig->model, str_VM)) {
model = PCMODEL_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;	model = PCMODEL_EPSON \| PCMODEL_VM;
}	}
pccore.model = model;	pccore.model = model;

if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {	if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2))
	{
pccore.baseclock = PCBASECLOCK25; // 2.5MHz	pccore.baseclock = PCBASECLOCK25; // 2.5MHz
pccore.cpumode = 0;	pccore.cpumode = 0;
}	}
else {	else
	{
pccore.baseclock = PCBASECLOCK20; // 2.0MHz	pccore.baseclock = PCBASECLOCK20; // 2.0MHz
pccore.cpumode = CPUMODE_8MHZ;	pccore.cpumode = CPUMODE_8MHZ;
}	}
multiple = np2cfg.multiple;	multiple = pConfig->multiple;
if (multiple == 0) {	if (multiple == 0)
	{
multiple = 1;	multiple = 1;
}	}
else if (multiple > 32) {	else if (multiple > 32)
	{
multiple = 32;	multiple = 32;
}	}
pccore.multiple = multiple;	pccore.multiple = multiple;
pccore.realclock = pccore.baseclock * multiple;	pccore.realclock = pccore.baseclock * multiple;

// HDDの接続 (I/Oの使用状態が変わるので..	// HDDの接続 (I/Oの使用状態が変わるので..
if (np2cfg.dipsw[1] & 0x20) {	if (pConfig->dipsw[1] & 0x20)
	{
pccore.hddif \|= PCHDD_IDE;	pccore.hddif \|= PCHDD_IDE;
#if defined(SUPPORT_IDEIO)	#if defined(SUPPORT_IDEIO)
sxsi_setdevtype(0x02, SXSIDEV_CDROM);	sxsi_setdevtype(0x02, SXSIDEV_CDROM);
#endif	#endif
}	}
else {	else
	{
sxsi_setdevtype(0x02, SXSIDEV_NC);	sxsi_setdevtype(0x02, SXSIDEV_NC);
}	}

// 拡張メモリ	// 拡張メモリ
extsize = 0;	extsize = 0;
if (!(np2cfg.dipsw[2] & 0x80)) {	if (!(pConfig->dipsw[2] & 0x80))
	{
extsize = np2cfg.EXTMEM;	extsize = np2cfg.EXTMEM;
#if defined(CPUCORE_IA32)	#if defined(CPUCORE_IA32)
extsize = min(extsize, 63);	extsize = min(extsize, 63);
Line 160 static void pccore_set(void) {	Line 167 static void pccore_set(void) {
#endif	#endif
}	}
pccore.extmem = extsize;	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の接続	// その他CBUSの接続
pccore.device = 0;	pccore.device = 0;
if (np2cfg.pc9861enable) {	if (pConfig->pc9861enable)
	{
pccore.device \|= PCCBUS_PC9861K;	pccore.device \|= PCCBUS_PC9861K;
}	}
if (np2cfg.mpuenable) {	if (pConfig->mpuenable)
	{
pccore.device \|= PCCBUS_MPU98;	pccore.device \|= PCCBUS_MPU98;
}	}
}	}
Line 179 static void pccore_set(void) {	Line 188 static void pccore_set(void) {
// --------------------------------------------------------------------------	// --------------------------------------------------------------------------

#if !defined(DISABLE_SOUND)	#if !defined(DISABLE_SOUND)
static void sound_init(void) {	static void sound_init()
	{
UINT rate;	UINT rate;

rate = np2cfg.samplingrate;	rate = np2cfg.samplingrate;
if ((rate != 11025) && (rate != 22050) && (rate != 44100)) {	if ((rate != 11025) && (rate != 22050) && (rate != 44100))
	{
rate = 0;	rate = 0;
}	}
sound_create(rate, np2cfg.delayms);	sound_create(rate, np2cfg.delayms);
Line 236 void pccore_init(void) {	Line 246 void pccore_init(void) {
fddfile_initialize();	fddfile_initialize();

#if !defined(DISABLE_SOUND)	#if !defined(DISABLE_SOUND)
sound_init();	sound_init(&np2cfg);
#endif	#endif

rs232c_construct();	rs232c_construct();
Line 303 void pccore_reset(void) {	Line 313 void pccore_reset(void) {
if (soundrenewal) {	if (soundrenewal) {
soundrenewal = 0;	soundrenewal = 0;
sound_term();	sound_term();
sound_init();	sound_init(&np2cfg);
}	}
#endif	#endif
ZeroMemory(mem, 0x110000);	ZeroMemory(mem, 0x110000);
Line 312 void pccore_reset(void) {	Line 322 void pccore_reset(void) {
ZeroMemory(mem + FONT_ADRS, 0x08000);	ZeroMemory(mem + FONT_ADRS, 0x08000);

//メモリスイッチ	//メモリスイッチ
for (i=0; i<8; i++) {	for (i=0; i<8; i++)
	{
mem[0xa3fe2 + i*4] = np2cfg.memsw[i];	mem[0xa3fe2 + i*4] = np2cfg.memsw[i];
}	}

pccore_set();	pccore_set(&np2cfg);
nevent_allreset();	nevent_allreset();

CPU_RESET();	CPU_RESET();
Line 355 void pccore_reset(void) {	Line 366 void pccore_reset(void) {
fddfile_reset2dmode();	fddfile_reset2dmode();
bios0x18_16(0x20, 0xe1);	bios0x18_16(0x20, 0xe1);

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

i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0);	MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0);
iocore_build();	iocore_build();
iocore_bind();	iocore_bind();
cbuscore_bind();	cbuscore_bind();

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

Removed from v.1.105
changed lines
	Added in v.1.107