--- np2/io/np2sysp.c	2004/01/07 06:53:48	1.8
+++ np2/io/np2sysp.c	2007/01/08 08:52:21	1.22
@@ -1,12 +1,16 @@
 #include	"compiler.h"
 #include	"strres.h"
+#if defined(OSLANG_UCS2)
+#include	"oemtext.h"
+#endif
 #include	"taskmng.h"
 #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
-#include	"bios.h"
-#include	"sxsi.h"
-// #include	"hostdrv.h"
+#include	"sxsibios.h"
+#if defined(SUPPORT_HOSTDRV)
+#include	"hostdrv.h"
+#endif
 
 
 #define		NP2SYSP_VER			"C"
@@ -37,246 +41,179 @@ const void	*arg1;
 	long	arg2;
 } SYSPCMD;
 
-static const char str_80286[] = "80286";
-static const char str_v30[] = "V30";
-static const char str_pentium[] = "PENTIUM";
-static const char str_mhz[] = "%uMHz";
+static const OEMCHAR str_80286[] = OEMTEXT("80286");
+static const OEMCHAR str_v30[] = OEMTEXT("V30");
+static const OEMCHAR str_pentium[] = OEMTEXT("PENTIUM");
+static const OEMCHAR str_mhz[] = OEMTEXT("%uMHz");
 
 
-static void cmd_outstr(const void *arg1, long arg2) {
+static void setoutstr(const OEMCHAR *str) {
 
-	milstr_ncpy(np2sysp.outstr, (char *)arg1, sizeof(np2sysp.outstr));
+#if defined(OSLANG_UCS2)
+	oemtext_oemtosjis(np2sysp.outstr, sizeof(np2sysp.outstr), str, -1);
+#else
+	milstr_ncpy(np2sysp.outstr, str, sizeof(np2sysp.outstr));
+#endif
 	np2sysp.outpos = 0;
+}
+
+void np2sysp_outstr(const void *arg1, long arg2) {
+
+	setoutstr((OEMCHAR *)arg1);
 	(void)arg2;
 }
 
-static void cmd_poweroff(const void *arg1, long arg2) {
+static void np2sysp_poweroff(const void *arg1, long arg2) {
 
 	taskmng_exit();
 	(void)arg1;
 	(void)arg2;
 }
 
-static void cmd_cpu(const void *arg1, long arg2) {
+static void np2sysp_cpu(const void *arg1, long arg2) {
 
 	// CPUを返す
 #if 1											// 80286 or V30
 	if (!(CPU_TYPE & CPUTYPE_V30)) {
-		cmd_outstr(str_80286, 0);
+		setoutstr(str_80286);
 	}
 	else {
-		cmd_outstr(str_v30, 0);
+		setoutstr(str_v30);
 	}
 #else
 	// 386機以降の場合 V30モードはエミュレーションだから固定(?)
-	cmd_outstr(str_pentium, 0);
+	setoutstr(str_pentium);
 #endif
 	(void)arg1;
 	(void)arg2;
 }
 
-static void cmd_clock(const void *arg1, long arg2) {
+static void np2sysp_clock(const void *arg1, long arg2) {
 
-	SPRINTF(np2sysp.outstr, str_mhz, (pc.realclock + 500000) / 1000000);
-	np2sysp.outpos = 0;
-	(void)arg1;
-	(void)arg2;
-}
+	OEMCHAR	str[16];
 
-static void cmd_multiple(const void *arg1, long arg2) {
-
-	SPRINTF(np2sysp.outstr, str_u, pc.multiple);
-	np2sysp.outpos = 0;
+	OEMSPRINTF(str, str_mhz, (pccore.realclock + 500000) / 1000000);
+	setoutstr(str);
 	(void)arg1;
 	(void)arg2;
 }
 
+static void np2sysp_multiple(const void *arg1, long arg2) {
 
-// ---- SXSI BIOS
-
-typedef struct {
-	BYTE	r_ax[2];
-	BYTE	r_bx[2];
-	BYTE	r_cx[2];
-	BYTE	r_dx[2];
-	BYTE	r_bp[2];
-	BYTE	r_es[2];
-} B1BREG;
-
-static void cmd_sxsibios(const void *arg1, long arg2) {
-
-	UINT16	org_ax, org_cx, org_dx, org_bx, org_bp, org_es;
-	UINT32	org_esbase;
-	B1BREG	r;
-	REG16	tmp;
-	UINT8	ret;
-	REG8	flag;
-
-	org_ax = CPU_AX;
-	org_cx = CPU_CX;
-	org_dx = CPU_DX;
-	org_bx = CPU_BX;
-	org_bp = CPU_BP;
-	org_es = CPU_ES;
-	org_esbase = ES_BASE;
-
-	i286_memstr_read(CPU_SS, CPU_SP, &r, sizeof(r));
-	CPU_AX = LOADINTELWORD(r.r_ax);
-	CPU_BX = LOADINTELWORD(r.r_bx);
-	CPU_CX = LOADINTELWORD(r.r_cx);
-	CPU_DX = LOADINTELWORD(r.r_dx);
-	CPU_BP = LOADINTELWORD(r.r_bp);
-	tmp = LOADINTELWORD(r.r_es);
-	CPU_ES = tmp;
-	ES_BASE = tmp << 4;
-	switch(CPU_AX & 0xf0) {
-		case 0x00:
-		case 0x20:
-			ret = sxsi_operate(HDDTYPE_SASI);
-			break;
-
-		case 0x80:
-		case 0xa0:
-			ret = sxsi_operate(HDDTYPE_SCSI);
-			break;
-
-		default:
-			ret = 0x40;
-			break;
-	}
-	r.r_ax[0] = CPU_AL;
-	r.r_ax[1] = ret;
-	STOREINTELWORD(r.r_bx, CPU_BX);
-	STOREINTELWORD(r.r_cx, CPU_CX);
-	STOREINTELWORD(r.r_dx, CPU_DX);
-	i286_memstr_write(CPU_SS, CPU_SP, &r, 8);
-	flag = i286_membyte_read(CPU_SS, CPU_SP + 0x16) & 0xfe;
-	if (ret >= 0x20) {
-		flag += 1;
-	}
-	i286_membyte_write(CPU_SS, CPU_SP + 0x16, flag);
+	OEMCHAR	str[16];
 
-	CPU_AX = org_ax;
-	CPU_CX = org_cx;
-	CPU_DX = org_dx;
-	CPU_BX = org_bx;
-	CPU_BP = org_bp;
-	CPU_ES = org_es;
-	ES_BASE = org_esbase;
+	OEMSPRINTF(str, str_u, pccore.multiple);
+	setoutstr(str);
+	(void)arg1;
+	(void)arg2;
 }
 
+static void np2sysp_hwreset(const void *arg1, long arg2) {
 
-#if 0
-// ---- hostdrv
-
-enum {
-	OPEN_HOSTDRV	= 0,
-	CLOSE_HOSTDRV	= 1,
-	INTR_HOSTDRV	= 2
-};
-
-static void cmd_hostdrv(const void *arg1, long arg2) {
-
-	switch(arg2) {
-		case OPEN_HOSTDRV:
-			if (hostdrv_mount() == SUCCESS) {
-				cmd_outstr("ok", 0);
-			}
-			else {
-				cmd_outstr("ng", 0);
-			}
-			break;
-
-		case CLOSE_HOSTDRV:
-			hostdrv_unmount();
-			break;
-
-		case INTR_HOSTDRV:
-			hostdrv_intr();
-			break;
-	}
+	hardwarereset = TRUE;
+	(void)arg1;
+	(void)arg2;
 }
-#endif
 
 
 // ----
 
-static const char str_np2[] = "NP2";
-static const char str_ver[] = "ver";
-static const char str_poweroff[] = "poweroff";
-static const char str_credit[] = "credit";
-static const char str_cpu[] = "cpu";
-static const char str_clock[] = "clock";
-static const char str_multiple[] = "multiple";
-static const char str_sxsibios[] = "sxsibios";
-static const char str_hdrvcheck[] = "check_hostdrv";
-static const char str_hdrvopen[] = "open_hostdrv";
-static const char str_hdrvclose[] = "close_hostdrv";
-static const char str_hdrvintr[] = "intr_hostdrv";
+static const char cmd_np2[] = "NP2";
+static const OEMCHAR rep_np2[] = OEMTEXT("NP2");
 
+static const char cmd_ver[] = "ver";
+static const char cmd_poweroff[] = "poweroff";
+static const char cmd_credit[] = "credit";
+static const char cmd_cpu[] = "cpu";
+static const char cmd_clock[] = "clock";
+static const char cmd_multiple[] = "multiple";
+static const char cmd_hwreset[] = "hardwarereset";
+#if defined(SUPPORT_IDEIO) || defined(SUPPORT_SASI)
+static const char cmd_sasibios[] = "sasibios";
+#endif
+#if defined(SUPPORT_SCSI)
+static const char cmd_scsibios[] = "scsibios";
+static const char cmd_scsidev[] = "scsi_dev";
+#endif
+#if defined(SUPPORT_HOSTDRV)
+static const char cmd_hdrvcheck[] = "check_hostdrv";
+static const char cmd_hdrvopen[] = "open_hostdrv";
+static const char cmd_hdrvclose[] = "close_hostdrv";
+static const char cmd_hdrvintr[] = "intr_hostdrv";
+static const OEMCHAR rep_hdrvcheck[] = OEMTEXT("0.74");
+#endif
 
 #if defined(NP2SYSP_VER)
-static const char str_syspver[] = NP2SYSP_VER;
+static const OEMCHAR str_syspver[] = OEMTEXT(NP2SYSP_VER);
 #else
 #define	str_syspver		str_null
 #endif
 
 #if defined(NP2SYSP_CREDIT)
-static const char str_syspcredit[] = NP2SYSP_CREDIT;
+static const OEMCHAR str_syspcredit[] = OEMTEXT(NP2SYSP_CREDIT);
 #else
 #define	str_syspcredit	str_null
 #endif
 
 
 static const SYSPCMD np2spcmd[] = {
-			{str_np2,		cmd_outstr,		str_np2,		0},
-			{str_ver,		cmd_outstr,		str_syspver,	0},
+			{cmd_np2,		np2sysp_outstr,		rep_np2,		0},
+			{cmd_ver,		np2sysp_outstr,		str_syspver,	0},
 
 // version:A
-			{str_poweroff,	cmd_poweroff,	NULL,			0},
+			{cmd_poweroff,	np2sysp_poweroff,	NULL,			0},
 
 // version:B
-			{str_credit,	cmd_outstr,		str_syspcredit,	0},
-			{str_cpu,		cmd_cpu,		NULL,			0},
-			{str_clock,		cmd_clock,		NULL,			0},
-			{str_multiple,	cmd_multiple,	NULL,			0},
+			{cmd_credit,	np2sysp_outstr,		str_syspcredit,	0},
+			{cmd_cpu,		np2sysp_cpu,		NULL,			0},
+			{cmd_clock,		np2sysp_clock,		NULL,			0},
+			{cmd_multiple,	np2sysp_multiple,	NULL,			0},
 
 // version:C
-			{str_sxsibios,	cmd_sxsibios,	NULL,			0},
+			{cmd_hwreset,	np2sysp_hwreset,	NULL,			0},
 
-#if 0
 // extension
-			{str_hdrvcheck,	cmd_outstr,		"supported",	0},
-			{str_hdrvopen,	cmd_hostdrv,	NULL,			OPEN_HOSTDRV},
-			{str_hdrvclose,	cmd_hostdrv,	NULL,			CLOSE_HOSTDRV},
-			{str_hdrvintr,	cmd_hostdrv,	NULL,			INTR_HOSTDRV},
+#if defined(SUPPORT_IDEIO) || defined(SUPPORT_SASI)
+			{cmd_sasibios,	np2sysp_sasi,		NULL,			0},
+#endif
+#if defined(SUPPORT_SCSI)
+			{cmd_scsibios,	np2sysp_scsi,		NULL,			0},
+			{cmd_scsidev,	np2sysp_scsidev,	NULL,			0},
+#endif
+
+#if defined(SUPPORT_HOSTDRV)
+			{cmd_hdrvcheck,	np2sysp_outstr,		rep_hdrvcheck,	0},
+			{cmd_hdrvopen,	hostdrv_mount,		NULL,			0},
+			{cmd_hdrvclose,	hostdrv_unmount,	NULL,			0},
+			{cmd_hdrvintr,	hostdrv_intr,		NULL,			0},
 #endif
 };
 
 
-static BOOL np2syspcmp(const char *p) {
+static BRESULT np2syspcmp(const char *p) {
 
 	int		len;
 	int		pos;
 
-	len = strlen(p);
+	len = (int)STRLEN(p);
 	if (!len) {
-		return(TRUE);
+		return(FAILURE);
 	}
 	pos = np2sysp.strpos;
 	while(len--) {
 		if (p[len] != np2sysp.substr[pos]) {
-			return(TRUE);
+			return(FAILURE);
 		}
 		pos--;
 		pos &= NP2SYSP_MASK;
 	}
-	return(FALSE);
+	return(SUCCESS);
 }
 
 static void IOOUTCALL np2sysp_o7ed(UINT port, REG8 dat) {
 
 	np2sysp.outval = (dat << 24) + (np2sysp.outval >> 8);
+	(void)port;
 }
 
 static void IOOUTCALL np2sysp_o7ef(UINT port, REG8 dat) {
@@ -286,7 +223,7 @@ const SYSPCMD	*cmdterm;
 
 	np2sysp.substr[np2sysp.strpos] = (char)dat;
 	cmd = np2spcmd;
-	cmdterm = cmd + (sizeof(np2spcmd) / sizeof(SYSPCMD));
+	cmdterm = cmd + NELEMENTS(np2spcmd);
 	while(cmd < cmdterm) {
 		if (!np2syspcmp(cmd->key)) {
 			cmd->func(cmd->arg1, cmd->arg2);
@@ -305,6 +242,7 @@ static REG8 IOINPCALL np2sysp_i7ed(UINT 
 
 	ret = (REG8)(np2sysp.inpval & 0xff);
 	np2sysp.inpval = (ret << 24) + (np2sysp.inpval >> 8);
+	(void)port;
 	return(ret);
 }
 
@@ -321,6 +259,19 @@ static REG8 IOINPCALL np2sysp_i7ef(UINT 
 	return(ret);
 }
 
+#if defined(NP2APPDEV)
+static void IOOUTCALL np2sysp_o0e9(UINT port, REG8 dat) {
+
+	APPDEVOUT(dat);
+	(void)port;
+}
+
+static REG8 IOINPCALL np2sysp_i0e9(UINT port) {
+
+	return((UINT8)port);
+}
+#endif
+
 
 // ---- I/F
 
@@ -335,5 +286,10 @@ void np2sysp_bind(void) {
 	iocore_attachout(0x07ef, np2sysp_o7ef);
 	iocore_attachinp(0x07ef, np2sysp_i7ed);
 	iocore_attachinp(0x07ef, np2sysp_i7ef);
+
+#if defined(NP2APPDEV)
+	iocore_attachout(0x00e9, np2sysp_o0e9);
+	iocore_attachinp(0x00e9, np2sysp_i0e9);
+#endif
 }