--- np2/bios/bios.c 2004/01/05 11:46:56 1.21 +++ np2/bios/bios.c 2004/01/08 16:29:56 1.24 @@ -14,6 +14,7 @@ #include "keytable.res" #include "itfrom.res" #include "startup.res" +#include "biosboot.res" #include "sxsibios.res" @@ -171,6 +172,7 @@ void bios_init(void) { CopyMemory(mem + 0xfd800 + 0x1ab7, fdfmt2hd, sizeof(fdfmt2hd)); CopyMemory(mem + 0xfd800 + 0x1adf, fdfmt2dd, sizeof(fdfmt2dd)); CopyMemory(mem + 0xfd800 + 0x1980, fdfmt144, sizeof(fdfmt144)); // ver0.31 + CopyMemory(mem + 0xfd800 + 0x2400, biosboot, sizeof(biosboot)); // ver0.73 SETBIOSMEM16(0xfffe8, 0xcb90); SETBIOSMEM16(0xfffec, 0xcb90); @@ -185,7 +187,7 @@ void bios_init(void) { bios_reinitbyswitch(); mem[MEMB_CRT_STS_FLAG] = 0x84; - mem[MEMB_BIOS_FLAG0] = 0x03; // 00/05/17 beep tone + mem[MEMB_BIOS_FLAG0] = 0x03; mem[MEMB_F2DD_MODE] = 0xff; // ver0.29 SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003); // ver0.29 SETBIOSMEM32(MEMD_F2DD_POINTER, 0xfd801ad7); @@ -207,14 +209,17 @@ void bios_init(void) { #else fh = file_open_c("itf.rom"); if (fh != FILEH_INVALID) { - file_read(fh, &mem[ITF_ADRS], 0x8000); + file_read(fh, mem + ITF_ADRS, 0x8000); file_close(fh); + TRACEOUT(("load itf.rom")); } extmem_init(np2cfg.EXTMEM); #endif -// CopyMemory(mem + 0xd0000, sxsibios, sizeof(sxsibios)); - CopyMemory(mem + 0x1c0000, mem + 0x1f8000, 0x08000); + CopyMemory(mem + 0xd0000, sxsibios, sizeof(sxsibios)); + CPU_RAM_D000 &= ~(1 << 0); + + CopyMemory(mem + 0x1c0000, mem + ITF_ADRS, 0x08000); CopyMemory(mem + 0x1e8000, mem + 0x0e8000, 0x10000); } @@ -237,7 +242,7 @@ static void bios_boot(void) { else { CPU_SP = GETBIOSMEM16(0x00404); CPU_SS = GETBIOSMEM16(0x00406); - TRACEOUT(("Protect Disable... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP)); + TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP)); } } @@ -247,9 +252,13 @@ UINT MEMCALL biosfunc(UINT32 adrs) { UINT16 bootseg; if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) { +#if 1 // for epson ITF + return(0); +#else CPU_IP--; CPU_REMCLOCK = -1; return(1); +#endif } switch(adrs) { // ver0.30 @@ -353,8 +362,12 @@ UINT MEMCALL biosfunc(UINT32 adrs) { return(1); case 0xfd802: // ブート - bios_reinitbyswitch(); // ver0.27 - bios_vectorset(); // ver0.29 + bios_reinitbyswitch(); + bios_vectorset(); +#if 1 // ver0.73 + CPU_CS = 0xfd80; + CPU_IP = 0x2400; +#else bootseg = bootstrapload(); CPU_STI; CPU_CS = (bootseg != 0)?bootseg:0xe800; @@ -362,6 +375,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) { CPU_SS = 0x0030; CPU_SP = 0x00e6; CPU_IP = 0x0000; +#endif return(1); case 0xfffe8: // ブートストラップロード @@ -371,8 +385,6 @@ UINT MEMCALL biosfunc(UINT32 adrs) { CPU_STI; CPU_CS = bootseg; CPU_IP = 0x0000; - CPU_SS = 0x0030; - CPU_SP = 0x00e6; return(1); } return(0);