--- np2/bios/bios.c 2004/02/18 02:03:36 1.39 +++ np2/bios/bios.c 2004/02/20 16:20:41 1.44 @@ -83,7 +83,7 @@ static void bios_reinitbyswitch(void) { mem[MEMB_PRXDUPD] = prxdupd; biosflag = 0x20; - if (pccore.cpumode & CPUMODE_8MHz) { + if (pccore.cpumode & CPUMODE_8MHZ) { biosflag |= 0x80; } biosflag |= mem[0xa3fea] & 7; @@ -122,7 +122,7 @@ static void bios_reinitbyswitch(void) { } } -static void bios_vectorset(void) { // ver0.30 +static void bios_vectorset(void) { UINT i; @@ -162,7 +162,7 @@ static const UINT16 biosoffset[0x20] = { BIOSOFST_1c, BIOSOFST_IRET, BIOSOFST_1e, BIOSOFST_1f}; -void bios_init(void) { +void bios_initialize(void) { char path[MAX_PATH]; FILEH fh; @@ -198,9 +198,9 @@ void bios_init(void) { } CopyMemory(mem + BIOS_BASE + BIOSOFST_PRT, printmain, sizeof(printmain)); - bios_vectorset(); // ver0.29 + bios_vectorset(); if (!biosrom) { - lio_init(); + lio_initialize(); } SETBIOSMEM16(0xfd800, 0xcb90); @@ -228,8 +228,8 @@ void bios_init(void) { bios_reinitbyswitch(); // mem[MEMB_CRT_STS_FLAG] = 0x84; // -> bios_screeninit() // mem[MEMB_BIOS_FLAG0] = 0x03; -// mem[MEMB_F2DD_MODE] = 0xff; // ver0.29 -// SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003); // ver0.29 +// mem[MEMB_F2DD_MODE] = 0xff; +// SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003); mem[0x005ae] |= 0x03; // ver0.31 CopyMemory(mem + 0x0fde00, keytable[0], 0x300); @@ -288,16 +288,11 @@ UINT MEMCALL biosfunc(UINT32 adrs) { UINT16 bootseg; if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) { -#if 1 // for epson ITF + // for epson ITF return(0); -#else - CPU_IP--; - CPU_REMCLOCK = -1; - return(1); -#endif } - switch(adrs) { // ver0.30 + switch(adrs) { case BIOS_BASE + BIOSOFST_EOIM: CPU_REMCLOCK -= 300; iocore_out8(0x00, 0x20); @@ -368,11 +363,12 @@ UINT MEMCALL biosfunc(UINT32 adrs) { case BIOS_BASE + BIOSOFST_1f: CPU_REMCLOCK -= 200; + TRACEOUT(("unsupport protect bios")); return(1); case BIOS_BASE + BIOSOFST_WAIT: CPU_STI; - if (fddmtr_biosbusy) { // ver0.26 + if (fddmtr.busy) { CPU_IP--; CPU_REMCLOCK = -1; } @@ -441,9 +437,16 @@ UINT MEMCALL biosfunc(UINT32 adrs) { return(0); } - if ((adrs >= 0xf9a00) && (adrs < 0x0f9a24)) { - if (!(adrs & 1)) { - bios_lio((BYTE)((adrs - 0xf9a00) >> 1)); + if ((adrs >= 0xf9a00) && (adrs < 0x0f9a44)) { + if (!(adrs & 3)) { + bios_lio((REG8)((adrs - 0xf9a00) >> 2)); + } + else { + if (nevent_iswork(NEVENT_GDCSLAVE)) { + CPU_IP--; + CPU_REMCLOCK = -1; + return(1); + } } return(0); }