--- np2/pccore.c	2003/11/30 11:20:55	1.22
+++ np2/pccore.c	2003/12/04 13:54:28	1.26
@@ -1,4 +1,5 @@
 #include	"compiler.h"
+#include	"dosio.h"
 #include	"soundmng.h"
 #include	"sysmng.h"
 #include	"timemng.h"
@@ -31,7 +32,6 @@
 #include	"timing.h"
 //#include	"hostdrv.h"
 #include	"debugsub.h"
-#include	"dosio.h"
 
 
 	const char	np2version[] = NP2VER_CORE;
@@ -51,7 +51,7 @@
 				1, 0x82,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
 				1, 80, 0,
-				{"", ""}, ""};
+				{"", ""}, "", ""};
 
 	PCCORE	pc = {	PCBASECLOCK25,
 					4,
@@ -80,6 +80,26 @@ static const BYTE msw_default[8] =
 
 // ---------------------------------------------------------------------------
 
+void getbiospath(char *path, const char *fname, int maxlen) {
+
+const char	*p;
+
+	p = np2cfg.biospath;
+
+	p = np2cfg.biospath;
+	if (p[0]) {
+		file_cpyname(path, p, maxlen);
+		file_setseparator(path, maxlen);
+		file_catname(path, fname, maxlen);
+	}
+	else {
+		file_cpyname(path, file_getcd(fname), maxlen);
+	}
+}
+
+
+// ----
+
 static void setvsyncclock(void) {
 
 	UINT	vfp;
@@ -184,6 +204,8 @@ static void sound_term(void) {
 
 void pccore_init(void) {
 
+	i286_initialize();
+
 	pal_initlcdtable();
 	pal_makelcdpal();
 	pal_makeskiptable();
@@ -519,8 +541,8 @@ void pccore_exec(BOOL draw) {
 	resetcnt++;
 #endif
 		pic_irq();
-		if (cpuio.reset_req) {
-			cpuio.reset_req = 0;
+		if (i286core.s.resetreq) {
+			i286core.s.resetreq = 0;
 			I286_CS = 0xf000;
 			CS_BASE = 0xf0000;
 			I286_IP = 0xfff0;