--- np2/bios/bios.c 2004/03/04 16:58:57 1.52 +++ np2/bios/bios.c 2004/03/08 15:27:07 1.56 @@ -26,6 +26,59 @@ static const char neccheck[] = "Copyrigh // 00/05/18 MS-DOS6.2 on PC-9801VX calling proc static const BYTE printmain[] = {0x90, 0x5a, 0x1f, 0xcf}; +typedef struct { + UINT8 port; + UINT8 data; +} IODATA; + +static const IODATA iodata[] = { + // DMA + {0x29, 0x00}, {0x29, 0x01}, {0x29, 0x02}, {0x29, 0x03}, + {0x27, 0x00}, {0x21, 0x00}, {0x23, 0x00}, {0x25, 0x00}, + {0x1b, 0x00}, {0x11, 0x40}, + + // PIT + {0x77, 0x30}, {0x71, 0x00}, {0x71, 0x00}, + {0x77, 0x76}, {0x73, 0xcd}, {0x73, 0x04}, + {0x77, 0xb6}, + + // PIC + {0x00, 0x11}, {0x02, 0x08}, {0x02, 0x80}, {0x02, 0x1d}, + {0x08, 0x11}, {0x0a, 0x10}, {0x0a, 0x07}, {0x0a, 0x09}, + {0x02, 0x7d}, {0x0a, 0x71}}; + +static const UINT8 msw_default[8] = + {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}; + + +static void bios_itfprepare(void) { + +const IODATA *p; +const IODATA *pterm; + + p = iodata; + pterm = iodata + (sizeof(iodata) / sizeof(IODATA)); + while(p < pterm) { + iocore_out8(p->port, p->data); + p++; + } + + // GDCの初期化。 + // … +} + +static void bios_memclear(void) { + + ZeroMemory(mem, 0xa0000); + ZeroMemory(mem + 0x100000, 0x10000); + if (CPU_EXTMEM) { + ZeroMemory(CPU_EXTMEM, CPU_EXTMEMSIZE); + } + ZeroMemory(mem + VRAM0_B, 0x18000); + ZeroMemory(mem + VRAM0_E, 0x08000); + ZeroMemory(mem + VRAM1_B, 0x18000); + ZeroMemory(mem + VRAM1_E, 0x08000); +} static void bios_reinitbyswitch(void) { @@ -115,6 +168,11 @@ static void bios_reinitbyswitch(void) { mem[0x45c] = 0x40; #endif + // FDC + if (fdc.support144) { + mem[MEMB_F144_SUP] |= fdc.equip; + } + // IDE initialize if (pccore.hddif & PCHDD_IDE) { mem[MEMB_SYS_TYPE] |= 0x80; // IDE @@ -123,13 +181,6 @@ static void bios_reinitbyswitch(void) { } } -static void bios_memclear(void) { - - ZeroMemory(mem, 0xa0000); - ZeroMemory(mem + VRAM1_B, 0x18000); - ZeroMemory(mem + VRAM1_E, 0x08000); -} - static void bios_vectorset(void) { UINT i; @@ -238,7 +289,7 @@ void bios_initialize(void) { // mem[MEMB_BIOS_FLAG0] = 0x03; // mem[MEMB_F2DD_MODE] = 0xff; // SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003); - mem[0x005ae] |= 0x03; // ver0.31 +// mem[0x005ae] |= 0x03; CopyMemory(mem + 0x0fde00, keytable[0], 0x300); // bios0x09_init(); @@ -269,18 +320,27 @@ void bios_initialize(void) { static void bios_boot(void) { + int i; + if (!(sysport.c & 0x80)) { CPU_SP = GETBIOSMEM16(0x00404); CPU_SS = GETBIOSMEM16(0x00406); // TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP)); } else { -// bios_memclear(); + bios_itfprepare(); + bios_memclear(); bios_vectorset(); bios0x09_init(); bios_reinitbyswitch(); - if (sysport.c & 0x20) { + if (!np2cfg.ITF_WORK) { + for (i=0; i<8; i++) { + mem[MEMB_MSW + (i*4)] = msw_default[i]; + } + CPU_IP = 0x0002; + } + else if (sysport.c & 0x20) { CPU_CS = 0x0000; CPU_IP = 0x04f8; CPU_DS = 0x0000; @@ -307,7 +367,7 @@ static void bios0x1f(void) { UINT l; if (CPU_AH == 0x90) { - i286_memstr_read(CPU_ES, CPU_BX + 0x10, work, 0x10); + MEML_READSTR(CPU_ES, CPU_BX + 0x10, work, 0x10); src = work[2] + (work[3] << 8) + (work[4] << 16) + CPU_SI; dst = work[10] + (work[11] << 8) + (work[12] << 16) + CPU_DI; leng = LOW16(CPU_CX - 1) + 1;