--- np2/io/np2sysp.c 2003/12/10 15:25:29 1.4 +++ np2/io/np2sysp.c 2004/03/22 05:38:47 1.15 @@ -4,19 +4,17 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" -// #include "hostdrv.h" -// #include "hostdir.h" +#include "sxsibios.h" +#if defined(SUPPORT_HOSTDRV) +#include "hostdrv.h" +#endif -#define NP2SYSP_VER "B" +#define NP2SYSP_VER "C" // #define NP2SYSP_CREDIT "" // 要るなら・・・ -#define OPEN_HOSTDRV 0 -#define INTR_HOSTDRV 1 -#define CLOSE_HOSTDRV 2 - // NP2依存ポート -// port:07edh reserved +// port:07edh np2 value comm // port:07efh np2 string comm // 基本的に STRINGでやり取りする @@ -35,9 +33,9 @@ typedef struct { const char *key; - void (*func)(const void *arg1, const void *arg2); + void (*func)(const void *arg1, long arg2); const void *arg1; -const void *arg2; + long arg2; } SYSPCMD; static const char str_80286[] = "80286"; @@ -46,77 +44,64 @@ static const char str_pentium[] = "PENTI static const char str_mhz[] = "%uMHz"; -static void np2sysp_outstr(const void *arg1, const void *arg2) { +void np2sysp_outstr(const void *arg1, long arg2) { milstr_ncpy(np2sysp.outstr, (char *)arg1, sizeof(np2sysp.outstr)); np2sysp.outpos = 0; (void)arg2; } -static void np2sysp_pwroff(const void *arg1, const void *arg2) { +static void np2sysp_poweroff(const void *arg1, long arg2) { taskmng_exit(); (void)arg1; (void)arg2; } -static void np2sysp_cpu(const void *arg1, const void *arg2) { +static void np2sysp_cpu(const void *arg1, long arg2) { // CPUを返す #if 1 // 80286 or V30 if (!(CPU_TYPE & CPUTYPE_V30)) { - np2sysp_outstr(str_80286, NULL); + np2sysp_outstr(str_80286, 0); } else { - np2sysp_outstr(str_v30, NULL); + np2sysp_outstr(str_v30, 0); } #else // 386機以降の場合 V30モードはエミュレーションだから固定(?) - np2sysp_outstr(str_pentium, NULL); + np2sysp_outstr(str_pentium, 0); #endif (void)arg1; (void)arg2; } -static void np2sysp_clock(const void *arg1, const void *arg2) { +static void np2sysp_clock(const void *arg1, long arg2) { - SPRINTF(np2sysp.outstr, str_mhz, (pc.realclock + 500000) / 1000000); + SPRINTF(np2sysp.outstr, str_mhz, (pccore.realclock + 500000) / 1000000); np2sysp.outpos = 0; (void)arg1; (void)arg2; } -static void np2sysp_mul(const void *arg1, const void *arg2) { +static void np2sysp_multiple(const void *arg1, long arg2) { - SPRINTF(np2sysp.outstr, str_u, pc.multiple); + SPRINTF(np2sysp.outstr, str_u, pccore.multiple); np2sysp.outpos = 0; (void)arg1; (void)arg2; } -#if 0 -static void np2sysp_hostdrv(const void *arg1, const void *arg2) { - - switch((DWORD)arg1) { - case OPEN_HOSTDRV: - if(open_hostdrv()) - np2sysp_outstr("ok", NULL); - else - np2sysp_outstr("ng", NULL); - break; +static void np2sysp_hwreset(const void *arg1, long arg2) { - case INTR_HOSTDRV: - intr_hostdrv(); - break; - - case CLOSE_HOSTDRV: - close_hostdrv(); - 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"; @@ -124,6 +109,15 @@ 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_hwreset[] = "hardwarereset"; +static const char str_sasibios[] = "sasibios"; +static const char str_scsibios[] = "scsibios"; +static const char str_scsidev[] = "scsi_dev"; +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"; + #if defined(NP2SYSP_VER) static const char str_syspver[] = NP2SYSP_VER; @@ -139,33 +133,35 @@ static const char str_syspcredit[] = NP2 static const SYSPCMD np2spcmd[] = { - {str_np2, np2sysp_outstr, str_np2, NULL}, - {str_ver, np2sysp_outstr, str_syspver, NULL}, + {str_np2, np2sysp_outstr, str_np2, 0}, + {str_ver, np2sysp_outstr, str_syspver, 0}, // version:A - {str_poweroff, np2sysp_pwroff, NULL, NULL}, + {str_poweroff, np2sysp_poweroff, NULL, 0}, // version:B - {str_credit, np2sysp_outstr, str_syspcredit, NULL}, - {str_cpu, np2sysp_cpu, NULL, NULL}, - {str_clock, np2sysp_clock, NULL, NULL}, - {str_multiple, np2sysp_mul, NULL, NULL}, - -#if 0 -// hostdrv - {"check_hostdrv", np2sysp_outstr, "supported", - NULL}, - {"open_hostdrv", np2sysp_hostdrv, (void *)OPEN_HOSTDRV, - NULL}, - {"intr_hostdrv", np2sysp_hostdrv, (void *)INTR_HOSTDRV, - NULL}, - {"close_hostdrv", np2sysp_hostdrv, (void *)CLOSE_HOSTDRV, - NULL}, - - {hostdir_check, np2sysp_outstr, hostdir_check, NULL}, - {"hostdir_reset", hostdir_reset, NULL, NULL}, - {"hostdir_band", hostdir_band, NULL, NULL}, - {"hostdir_int", hostdir_int, NULL, NULL}, + {str_credit, np2sysp_outstr, str_syspcredit, 0}, + {str_cpu, np2sysp_cpu, NULL, 0}, + {str_clock, np2sysp_clock, NULL, 0}, + {str_multiple, np2sysp_multiple, NULL, 0}, + +// version:C + {str_hwreset, np2sysp_hwreset, NULL, 0}, + +// extension +#if defined(SUPPORT_IDEIO) || defined(SUPPORT_SASI) + {str_sasibios, np2sysp_sasi, NULL, 0}, +#endif +#if defined(SUPPORT_SCSI) + {str_scsibios, np2sysp_scsi, NULL, 0}, + {str_scsidev, np2sysp_scsidev, NULL, 0}, +#endif + +#if defined(SUPPORT_HOSTDRV) + {str_hdrvcheck, np2sysp_outstr, "0.74", 0}, + {str_hdrvopen, hostdrv_mount, NULL, 0}, + {str_hdrvclose, hostdrv_unmount, NULL, 0}, + {str_hdrvintr, hostdrv_intr, NULL, 0}, #endif }; @@ -190,6 +186,12 @@ static BOOL np2syspcmp(const char *p) { return(FALSE); } +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) { const SYSPCMD *cmd; @@ -210,6 +212,16 @@ const SYSPCMD *cmdterm; (void)port; } +static REG8 IOINPCALL np2sysp_i7ed(UINT port) { + + REG8 ret; + + ret = (REG8)(np2sysp.inpval & 0xff); + np2sysp.inpval = (ret << 24) + (np2sysp.inpval >> 8); + (void)port; + return(ret); +} + static REG8 IOINPCALL np2sysp_i7ef(UINT port) { REG8 ret; @@ -233,7 +245,9 @@ void np2sysp_reset(void) { void np2sysp_bind(void) { + iocore_attachout(0x07ef, np2sysp_o7ed); iocore_attachout(0x07ef, np2sysp_o7ef); + iocore_attachinp(0x07ef, np2sysp_i7ed); iocore_attachinp(0x07ef, np2sysp_i7ef); }