--- np2/bios/bios1b.c 2003/10/21 11:22:05 1.3 +++ np2/bios/bios1b.c 2004/01/22 01:10:03 1.11 @@ -1,13 +1,15 @@ #include "compiler.h" -#include "i286.h" -#include "memory.h" +#include "cpucore.h" #include "pccore.h" #include "iocore.h" #include "bios.h" #include "biosmem.h" +#include "sxsibios.h" #include "fddfile.h" #include "fdd_mtr.h" #include "sxsi.h" +#include "scsicmd.h" +#include "timing.h" enum { @@ -16,7 +18,7 @@ enum { }; - char fdmode = 0; +// static UINT8 fdmode = 0; static BYTE work[65536]; static BYTE mtr_c = 0; static UINT mtr_r = 0; @@ -24,23 +26,29 @@ static UINT mtr_r = 0; // ---- FDD -static void init_fdd_equip(void) { +void fddbios_equip(REG8 type, BOOL clear) { - UINT16 diskequip; + REG16 diskequip; diskequip = GETBIOSMEM16(MEMW_DISK_EQUIP); - diskequip &= 0x0f00; - diskequip |= (UINT16)(~fdmode) & 3; - diskequip |= (UINT16)fdmode << 12; + if (clear) { + diskequip &= 0x0f00; + } + if (type == DISKTYPE_2HD) { + diskequip |= 0x0003; + } + if (type == DISKTYPE_2DD) { + diskequip |= 0x0300; + } SETBIOSMEM16(MEMW_DISK_EQUIP, diskequip); } static void biosfd_setchrn(void) { - fdc.C = I286_CL; - fdc.H = I286_DH; - fdc.R = I286_DL; - fdc.N = I286_CH; + fdc.C = CPU_CL; + fdc.H = CPU_DH; + fdc.R = CPU_DL; + fdc.N = CPU_CH; } #if 0 @@ -80,8 +88,8 @@ static BOOL biosfd_seek(BYTE track, BOOL static UINT16 fdfmt_biospara(BYTE fmt, BYTE rpm) { // ver0.31 - UINT16 seg; - UINT16 off; + UINT seg; + UINT off; UINT16 n; n = fdc.N; @@ -102,13 +110,13 @@ static UINT16 fdfmt_biospara(BYTE fmt, B off += fdc.us * 2; off = i286_memword_read(seg, off); off += n * 8; - if (!(I286_AH & 0x40)) { + if (!(CPU_AH & 0x40)) { off += 4; } if (fmt) { off += 2; } - return(i286_memword_read(seg, off)); + return(i286_memword_read(seg, LOW16(off))); } static void change_rpm(BYTE rpm) { // ver0.31 @@ -137,7 +145,7 @@ static void fdd_int(int result) { if (result == FDCBIOS_NORESULT) { // ver0.29 return; } - switch(I286_AH & 0x0f) { + switch(CPU_AH & 0x0f) { case 0x00: // シーク case 0x01: // ベリファイ case 0x02: // 診断の為の読み込み @@ -197,29 +205,29 @@ static struct { static void b0patch(void) { - if ((!b0p.flg) || (b0p.cx != I286_CX) || (b0p.dx != I286_DX)) { + if ((!b0p.flg) || (b0p.cx != CPU_CX) || (b0p.dx != CPU_DX)) { b0p.flg = TRUE; b0p.pos = 0; - b0p.cx = I286_CX; - b0p.dx = I286_DX; + b0p.cx = CPU_CX; + b0p.dx = CPU_DX; } else { if (!b0p.pos) { UINT32 addr; UINT size; UINT cnt; - BYTE c; - BYTE cl; - BYTE last; - addr = ES_BASE + I286_BP; - size = I286_BX; + REG8 c; + REG8 cl; + REG8 last; + addr = ES_BASE + CPU_BP; + size = CPU_BX; cnt = 0; last = 0; while(size--) { c = i286_memoryread(addr++); cl = 0; do { - BYTE now = c & 0x80; + REG8 now = c & 0x80; c <<= 1; b0p.pos++; if (now == last) { @@ -239,10 +247,10 @@ static void b0patch(void) { } } } - if ((b0p.pos >> 3) < I286_BX) { + if ((b0p.pos >> 3) < CPU_BX) { UINT32 addr; - BYTE c; - addr = ES_BASE + I286_BP + (b0p.pos >> 3); + REG8 c; + addr = ES_BASE + CPU_BP + (b0p.pos >> 3); c = i286_memoryread(addr); c ^= (1 << (b0p.pos & 7)); b0p.pos++; @@ -277,13 +285,13 @@ static BYTE fdd_operate(BYTE type, BOOL // とりあえずBIOSの時は無視する fdc.mf = 0xff; // ver0.29 -// TRACE_("int 1Bh", I286_AH); +// TRACE_("int 1Bh", CPU_AH); change_rpm(rpm); // ver0.31 - if ((I286_AH & 0x0f) != 0x0a) { + if ((CPU_AH & 0x0f) != 0x0a) { fdc.crcn = 0; } - if ((I286_AH & 0x0f) != 0x03) { + if ((CPU_AH & 0x0f) != 0x03) { CTRL_FDMEDIA = type; switch(type) { case DISKTYPE_2HD: @@ -297,21 +305,21 @@ static BYTE fdd_operate(BYTE type, BOOL } break; } - if (fdc.us != (I286_AL & 0x03)) { - fdc.us = I286_AL & 0x03; + if (fdc.us != (CPU_AL & 0x03)) { + fdc.us = CPU_AL & 0x03; fdc.crcn = 0; } - hd = ((I286_DH) ^ (I286_AL >> 2)) & 1; + hd = ((CPU_DH) ^ (CPU_AL >> 2)) & 1; if (fdc.hd != hd) { fdc.hd = hd; fdc.crcn = 0; } if (!fdd_diskready(fdc.us)) { fdd_int(FDCBIOS_NONREADY); - if (I286_AH == 0x84) { // ver0.28 + if (CPU_AH == 0x84) { // ver0.28 return(0x68); // 新センスは 両用ドライブ情報も } - if (I286_AH == 0xc4) { // ver0.31 + if (CPU_AH == 0xc4) { // ver0.31 if (np2cfg.usefd144) { return(0x6c); } @@ -328,10 +336,10 @@ static BYTE fdd_operate(BYTE type, BOOL } } - switch(I286_AH & 0x0f) { + switch(CPU_AH & 0x0f) { case 0x00: // シーク - if (I286_AH & 0x10) { - if (!biosfd_seek(I286_CL, ndensity)) { + if (CPU_AH & 0x10) { + if (!biosfd_seek(CPU_CL, ndensity)) { result = FDCBIOS_SEEKSUCCESS; } else { @@ -342,8 +350,8 @@ static BYTE fdd_operate(BYTE type, BOOL break; case 0x01: // ベリファイ - if (I286_AH & 0x10) { - if (!biosfd_seek(I286_CL, ndensity)) { + if (CPU_AH & 0x10) { + if (!biosfd_seek(CPU_CL, ndensity)) { result = FDCBIOS_SEEKSUCCESS; } else { @@ -364,7 +372,7 @@ static BYTE fdd_operate(BYTE type, BOOL else { secsize = 128 << 8; } - size = I286_BX; + size = CPU_BX; while(size) { if (size > secsize) { accesssize = secsize; @@ -377,7 +385,7 @@ static BYTE fdd_operate(BYTE type, BOOL } size -= accesssize; mtr_r += accesssize; // ver0.26 - if ((fdc.R++ == (BYTE)para) && (I286_AH & 0x80) && (!fdc.hd)) { + if ((fdc.R++ == (BYTE)para) && (CPU_AH & 0x80) && (!fdc.hd)) { fdc.hd = 1; fdc.H = 1; fdc.R = 1; @@ -397,7 +405,7 @@ static BYTE fdd_operate(BYTE type, BOOL break; case 0x03: // 初期化 - init_fdd_equip(); + fddbios_equip(type, FALSE); ret_ah = 0x00; break; @@ -409,7 +417,7 @@ static BYTE fdd_operate(BYTE type, BOOL else if (fdd_diskprotect(fdc.us)) { ret_ah = 0x10; } - if (I286_AL & 0x80) { // 2HD + if (CPU_AL & 0x80) { // 2HD ret_ah |= 0x01; } else { // 2DD @@ -420,9 +428,9 @@ static BYTE fdd_operate(BYTE type, BOOL ret_ah |= 0x04; } } - if (I286_AH & 0x80) { // ver0.30 + if (CPU_AH & 0x80) { // ver0.30 ret_ah |= 8; // 1MB/640KB両用ドライブ - if ((I286_AH & 0x40) && + if ((CPU_AH & 0x40) && (np2cfg.usefd144)) { // ver0.31 ret_ah |= 4; // 1.44対応ドライブ } @@ -430,8 +438,8 @@ static BYTE fdd_operate(BYTE type, BOOL break; case 0x05: // データの書き込み - if (I286_AH & 0x10) { - if (!biosfd_seek(I286_CL, ndensity)) { + if (CPU_AH & 0x10) { + if (!biosfd_seek(CPU_CL, ndensity)) { result = FDCBIOS_SEEKSUCCESS; } else { @@ -457,8 +465,8 @@ static BYTE fdd_operate(BYTE type, BOOL else { secsize = 128 << 8; } - size = I286_BX; - addr = ES_BASE + I286_BP; + size = CPU_BX; + addr = ES_BASE + CPU_BP; while(size) { if (size > secsize) { accesssize = secsize; @@ -473,7 +481,7 @@ static BYTE fdd_operate(BYTE type, BOOL addr += accesssize; size -= accesssize; mtr_r += accesssize; // ver0.26 - if ((fdc.R++ == (BYTE)para) && (I286_AH & 0x80) && (!fdc.hd)) { + if ((fdc.R++ == (BYTE)para) && (CPU_AH & 0x80) && (!fdc.hd)) { fdc.hd = 1; fdc.H = 1; fdc.R = 1; @@ -494,8 +502,8 @@ static BYTE fdd_operate(BYTE type, BOOL case 0x02: // 診断の為の読み込み case 0x06: // データの読み込み - if (I286_AH & 0x10) { - if (!biosfd_seek(I286_CL, ndensity)) { + if (CPU_AH & 0x10) { + if (!biosfd_seek(CPU_CL, ndensity)) { result = FDCBIOS_SEEKSUCCESS; } else { @@ -522,8 +530,8 @@ static BYTE fdd_operate(BYTE type, BOOL else { secsize = 128 << 8; } - size = I286_BX; - addr = ES_BASE + I286_BP; + size = CPU_BX; + addr = ES_BASE + CPU_BP; while(size) { if (size > secsize) { accesssize = secsize; @@ -539,7 +547,7 @@ static BYTE fdd_operate(BYTE type, BOOL size -= accesssize; mtr_r += accesssize; // ver0.26 if (fdc.R++ == (BYTE)para) { - if ((I286_AH & 0x80) && (!fdc.hd)) { + if ((CPU_AH & 0x80) && (!fdc.hd)) { fdc.hd = 1; fdc.H = 1; fdc.R = 1; @@ -569,7 +577,7 @@ static BYTE fdd_operate(BYTE type, BOOL #endif } #if 1 - else if ((I286_AH & 0x0f) == 0x02) { // ARS対策… + else if ((CPU_AH & 0x0f) == 0x02) { // ARS対策… ret_ah = 0x00; result = FDCBIOS_READERROR; } @@ -587,9 +595,9 @@ static BYTE fdd_operate(BYTE type, BOOL break; case 0x0a: // READ ID - fdc.mf = I286_AH & 0x40; // ver0.29 - if (I286_AH & 0x10) { // ver0.28 - if (!biosfd_seek(I286_CL, ndensity)) { + fdc.mf = CPU_AH & 0x40; // ver0.29 + if (CPU_AH & 0x10) { // ver0.28 + if (!biosfd_seek(CPU_CL, ndensity)) { result = FDCBIOS_SEEKSUCCESS; } else { @@ -609,23 +617,23 @@ static BYTE fdd_operate(BYTE type, BOOL mtr_r += 128 << 8; } ret_ah = 0x00; - I286_CL = fdc.C; - I286_DH = fdc.H; - I286_DL = fdc.R; - I286_CH = fdc.N; + CPU_CL = fdc.C; + CPU_DH = fdc.H; + CPU_DL = fdc.R; + CPU_CH = fdc.N; result = FDCBIOS_SUCCESS; break; case 0x0d: // フォーマット - if (I286_AH & 0x10) { - biosfd_seek(I286_CL, ndensity); + if (CPU_AH & 0x10) { + biosfd_seek(CPU_CL, ndensity); } if (fdd_diskprotect(fdc.us)) { ret_ah = 0x70; break; } - fdc.d = I286_DL; - fdc.N = I286_CH; + fdc.d = CPU_DL; + fdc.N = CPU_CH; para = fdfmt_biospara(1, rpm); if (!para) { ret_ah = 0xd0; @@ -633,9 +641,9 @@ static BYTE fdd_operate(BYTE type, BOOL } fdc.sc = (BYTE)para; fdd_formatinit(); - pos = I286_BP; + pos = CPU_BP; for (s=0; sfname[0])) { diskequip |= bit; } } @@ -669,18 +679,20 @@ static void init_sasi_equip(void) { static void init_scsi_equip(void) { - UINT i; - BYTE bit; + UINT8 i; + UINT8 bit; + SXSIDEV sxsi; UINT16 w; mem[MEMB_DISK_EQUIPS] = 0; ZeroMemory(&mem[0x00460], 0x20); - for (i=0, bit=1; i<2; i++, bit<<=1) { - if (sxsi_hd[i+2].fname[0]) { + for (i=0, bit=1; i<4; i++, bit<<=1) { + sxsi = sxsi_getptr((REG8)(0x20 + i)); + if ((sxsi) && (sxsi->fname[0])) { mem[MEMB_DISK_EQUIPS] |= bit; - mem[0x00460+i*4] = sxsi_hd[i+2].sectors; - mem[0x00461+i*4] = sxsi_hd[i+2].surfaces; - switch(sxsi_hd[i+2].size) { + mem[0x00460+i*4] = sxsi->sectors; + mem[0x00461+i*4] = sxsi->surfaces; + switch(sxsi->size) { case 256: w = 0 << 12; break; @@ -693,7 +705,8 @@ static void init_scsi_equip(void) { w = 2 << 12; break; } - w |= sxsi_hd[i+2].tracks; + w |= 0xc000; + w |= sxsi->cylinders; SETBIOSMEM16(0x00462+i*4, w); } } @@ -701,28 +714,25 @@ static void init_scsi_equip(void) { static BYTE sxsi_pos(long *pos) { - SXSIHDD sxsi; - int np2drv; + SXSIDEV sxsi; *pos = 0; - np2drv = (I286_AL & 0x20) >> 4; - if ((I286_AL & 0x0f) >= 2) { + sxsi = sxsi_getptr(CPU_AL); + if (sxsi == NULL) { return(0x60); } - np2drv |= (I286_AL & 1); - sxsi = &sxsi_hd[np2drv]; - if (I286_AL & 0x80) { - if ((I286_DL >= sxsi->sectors) || - (I286_DH >= sxsi->surfaces) || - (I286_CX >= sxsi->tracks)) { + if (CPU_AL & 0x80) { + if ((CPU_DL >= sxsi->sectors) || + (CPU_DH >= sxsi->surfaces) || + (CPU_CX >= sxsi->cylinders)) { return(0xd0); } - (*pos) = ((I286_CX * sxsi->surfaces) + I286_DH) * sxsi->sectors - + I286_DL; + *pos = ((CPU_CX * sxsi->surfaces) + CPU_DH) * sxsi->sectors + + CPU_DL; } else { - *pos = (I286_DL << 16) | I286_CX; - if (!(I286_AL & 0x20)) { + *pos = (CPU_DL << 16) | CPU_CX; + if (!(CPU_AL & 0x20)) { (*pos) &= 0x1fffff; } if ((*pos) >= sxsi->totals) { @@ -732,78 +742,126 @@ static BYTE sxsi_pos(long *pos) { return(0x00); } +static REG8 sxsidev_format(REG8 drv, SXSIDEV sxsi) { + + UINT count; + REG8 ret; + long trk; + long trkmax; + + count = timing_getcount(); // 時間を止める + + ret = 0; + trk = 0; + trkmax = sxsi->surfaces * sxsi->cylinders; + while(trk < trkmax) { + ret = sxsi_format(drv, trk * sxsi->sectors); + if (ret) { + break; + } + trk++; + } + + timing_setcount(count); // 再開 -static BYTE sxsi_operate(BYTE type) { + return(ret); +} + +REG8 sxsi_operate(REG8 type) { - BYTE ret_ah = 0x00; - BYTE drv; + SXSIDEV sxsi; + REG8 ret_ah; long pos; -// int i; - drv = (I286_AL & 0x20) >> 4; - if ((I286_AL & 0x0f) >= 2) { + sxsi = sxsi_getptr(CPU_AL); + if (sxsi == NULL) { return(0x60); } - drv |= (I286_AL & 1); - switch(I286_AH & 0x0f) { + ret_ah = 0x00; + switch(CPU_AH & 0x0f) { case 0x01: // ベリファイ case 0x07: // リトラクト case 0x0f: // リトラクト break; case 0x03: // イニシャライズ - if (type == HDDTYPE_SASI) { + if (type == BIOS1B_SASI) { init_sasi_equip(); } - else if (type == HDDTYPE_SCSI) { + else if (type == BIOS1B_SCSI) { init_scsi_equip(); } break; case 0x04: // センス ret_ah = 0x00; - if ((I286_AH == 0x04) && (type == HDDTYPE_SASI)) { + if ((CPU_AH == 0x04) && (type == BIOS1B_SASI)) { ret_ah = 0x04; } - else if ((I286_AH == 0x44) && (type == HDDTYPE_SCSI)) { - I286_BX = 1; + else if ((CPU_AH == 0x44) && (type == BIOS1B_SCSI)) { + CPU_BX = 1; } - else if (I286_AH == 0x84) { - I286_BX = sxsi_hd[drv].size; - I286_CX = sxsi_hd[drv].tracks; - I286_DH = sxsi_hd[drv].surfaces; - I286_DL = sxsi_hd[drv].sectors; + else if (CPU_AH == 0x84) { + CPU_BX = sxsi->size; + CPU_CX = sxsi->cylinders; + CPU_DH = sxsi->surfaces; + CPU_DL = sxsi->sectors; } break; case 0x05: // データの書き込み - i286_memx_read(ES_BASE + I286_BP, work, I286_BX); + i286_memx_read(ES_BASE + CPU_BP, work, CPU_BX); ret_ah = sxsi_pos(&pos); if (!ret_ah) { - ret_ah = sxsi_write(I286_AL, pos, work, I286_BX); + ret_ah = sxsi_write(CPU_AL, pos, work, CPU_BX); } break; case 0x06: // データの読み込み ret_ah = sxsi_pos(&pos); if (!ret_ah) { - ret_ah = sxsi_read(I286_AL, pos, work, I286_BX); + ret_ah = sxsi_read(CPU_AL, pos, work, CPU_BX); if (ret_ah < 0x20) { - i286_memx_write(ES_BASE + I286_BP, work, I286_BX); + i286_memx_write(ES_BASE + CPU_BP, work, CPU_BX); } } break; + case 0x0a: // セクタ長設定 + if ((type == BIOS1B_SCSI) && + (sxsi->size == (128 << (CPU_BH & 3)))) { + ret_ah = 0x00; + } + else { + ret_ah = 0x40; + } + break; + + case 0x0c: // 代替情報取得 + if (type == BIOS1B_SCSI) { + ret_ah = 0x00; + CPU_CX = 0; + } + else { + ret_ah = 0x40; + } + break; + case 0x0d: // フォーマット - if (I286_DL) { - ret_ah = 0x30; - break; + if (CPU_AH & 0x80) { + ret_ah = sxsidev_format(CPU_AL, sxsi); } - i286_memstr_read(I286_ES, I286_BP, work, I286_BX); - ret_ah = sxsi_pos(&pos); - if (!ret_ah) { - ret_ah = sxsi_format(I286_AL, pos); + else { + if (CPU_DL) { + ret_ah = 0x30; + break; + } + i286_memstr_read(CPU_ES, CPU_BP, work, CPU_BX); + ret_ah = sxsi_pos(&pos); + if (!ret_ah) { + ret_ah = sxsi_format(CPU_AL, pos); + } } break; @@ -886,13 +944,15 @@ static UINT16 boot_fd(BYTE drv, BYTE typ // 1.25MB bootseg = boot_fd1(0); if (bootseg) { - mem[MEMB_DISK_BOOT] = (BYTE)(0x90+drv); + mem[MEMB_DISK_BOOT] = (UINT8)(0x90 + drv); + fddbios_equip(DISKTYPE_2HD, TRUE); return(bootseg); } // 1.44MB bootseg = boot_fd1(1); if (bootseg) { - mem[MEMB_DISK_BOOT] = (BYTE)(0x30+drv); + mem[MEMB_DISK_BOOT] = (UINT8)(0x30 + drv); + fddbios_equip(DISKTYPE_2HD, TRUE); return(bootseg); } } @@ -901,15 +961,15 @@ static UINT16 boot_fd(BYTE drv, BYTE typ CTRL_FDMEDIA = DISKTYPE_2DD; bootseg = boot_fd1(0); if (bootseg) { - mem[MEMB_DISK_BOOT] = (BYTE)(0x70+drv); - fdmode = 3; + mem[MEMB_DISK_BOOT] = (BYTE)(0x70 + drv); + fddbios_equip(DISKTYPE_2DD, TRUE); return(bootseg); } } return(0); } -static UINT16 boot_hd(BYTE drv) { // ver0.27 +static REG16 boot_hd(REG8 drv) { BYTE ret; @@ -921,16 +981,17 @@ static UINT16 boot_hd(BYTE drv) { return(0); } -UINT16 bootstrapload(void) { // ver0.27 +REG16 bootstrapload(void) { BYTE i; - UINT16 bootseg; + REG16 bootseg; - fdmode = 0; +// fdmode = 0; bootseg = 0; switch(mem[MEMB_MSW5] & 0xf0) { // うぐぅ…本当はALレジスタの値から case 0x00: // ノーマル break; + case 0x20: // 640KB FDD for (i=0; (i<4) && (!bootseg); i++) { if (fdd_diskready(i)) { @@ -938,6 +999,7 @@ UINT16 bootstrapload(void) { // } } break; + case 0x40: // 1.2MB FDD for (i=0; (i<4) && (!bootseg); i++) { if (fdd_diskready(i)) { @@ -945,25 +1007,24 @@ UINT16 bootstrapload(void) { // } } break; + case 0x60: // MO break; + case 0xa0: // SASI 1 - if (sxsi_hd[0].fname[0]) { - bootseg = boot_hd(0x80); - } + bootseg = boot_hd(0x80); break; + case 0xb0: // SASI 2 - if (sxsi_hd[1].fname[0]) { - bootseg = boot_hd(0x81); - } + bootseg = boot_hd(0x81); break; + case 0xc0: // SCSI - for (i=0; (i<2) && (!bootseg); i++) { - if (sxsi_hd[i+2].fname[0]) { - bootseg = boot_hd((BYTE)(0xa0 | i)); - } + for (i=0; (i<4) && (!bootseg); i++) { + bootseg = boot_hd((REG8)(0xa0 + i)); } break; + default: // ROM return(0); } @@ -973,19 +1034,15 @@ UINT16 bootstrapload(void) { // } } for (i=0; (i<2) && (!bootseg); i++) { - if (sxsi_hd[i].fname[0]) { - bootseg = boot_hd((BYTE)(0x80 | i)); - } + bootseg = boot_hd((REG8)(0x80 + i)); } - for (i=0; (i<2) && (!bootseg); i++) { - if (sxsi_hd[i+2].fname[0]) { - bootseg = boot_hd((BYTE)(0xa0 | i)); - } + for (i=0; (i<4) && (!bootseg); i++) { + bootseg = boot_hd((REG8)(0xa0 + i)); } - init_fdd_equip(); - init_sasi_equip(); - init_scsi_equip(); +// init_fdd_equip(); +// init_sasi_equip(); +// init_scsi_equip(); return(bootseg); } @@ -994,9 +1051,57 @@ UINT16 bootstrapload(void) { // void bios0x1b(void) { BYTE ret_ah; - BYTE flag; + REG8 flag; + +#if defined(SUPPORT_SCSI) + if ((CPU_AL & 0xf0) == 0xc0) { + TRACEOUT(("%.4x:%.4x AX=%.4x BX=%.4x CX=%.4x DX=%.4 ES=%.4x BP=%.4x", + i286_memword_read(CPU_SS, CPU_SP+2), + i286_memword_read(CPU_SS, CPU_SP), + CPU_AX, CPU_BX, CPU_CX, CPU_DX, CPU_ES, CPU_BP)); + scsicmd_bios(); + return; + } +#endif - switch(I286_AL & 0xf0) { +#if 1 // bypass to disk bios +{ + REG8 seg; + UINT sp; + + seg = mem[0x004b0 + (CPU_AL >> 4)]; + if (seg) { + TRACEOUT(("call by %.4x:%.4x", + i286_memword_read(CPU_SS, CPU_SP+2), + i286_memword_read(CPU_SS, CPU_SP))); + sp = CPU_SP; + i286_memword_write(CPU_SS, sp - 2, CPU_DS); + i286_memword_write(CPU_SS, sp - 4, CPU_SI); + i286_memword_write(CPU_SS, sp - 6, CPU_DI); + i286_memword_write(CPU_SS, sp - 8, CPU_ES); // +a + i286_memword_write(CPU_SS, sp - 10, CPU_BP); // +8 + i286_memword_write(CPU_SS, sp - 12, CPU_DX); // +6 + i286_memword_write(CPU_SS, sp - 14, CPU_CX); // +4 + i286_memword_write(CPU_SS, sp - 16, CPU_BX); // +2 + i286_memword_write(CPU_SS, sp - 18, CPU_AX); // +0 + TRACEOUT(("bypass to %.4x:0018", seg << 8)); + TRACEOUT(("AX=%04x BX=%04x %02x:%02x:%02x:%02x ES=%04x BP=%04x", + CPU_AX, CPU_BX, CPU_CL, CPU_DH, CPU_DL, CPU_CH, + CPU_ES, CPU_BP)); + sp -= 18; + CPU_SP = sp; + CPU_BP = sp; + CPU_DS = 0x0000; + CPU_BX = 0x04B0; + CPU_AX = seg << 8; + CPU_CS = seg << 8; + CPU_IP = 0x18; + return; + } +} +#endif + + switch(CPU_AL & 0xf0) { case 0x90: ret_ah = fdd_operate(DISKTYPE_2HD, 0, 0); break; @@ -1018,12 +1123,15 @@ void bios0x1b(void) { case 0x00: case 0x80: - ret_ah = sxsi_operate(HDDTYPE_SASI); +// ret_ah = sxsi_operate(BIOS1B_SASI); + ret_ah = sasibios_operate(); break; -#if 0 + +#if defined(SUPPORT_SCSI) case 0x20: case 0xa0: - ret_ah = sxsi_operate(HDDTYPE_SCSI); +// ret_ah = sxsi_operate(BIOS1B_SCSI); + ret_ah = scsibios_operate(); break; #endif @@ -1034,7 +1142,7 @@ void bios0x1b(void) { #if 0 { static BYTE p = 0; - if ((I286_CL == 0x4d) && (ret_ah == 0xe0)) { + if ((CPU_CL == 0x4d) && (ret_ah == 0xe0)) { if (!p) { trace_sw = 1; p++; @@ -1044,23 +1152,19 @@ void bios0x1b(void) { } } #endif -#if 0 // def TRACE - { - char buf[256]; - wsprintf(buf, "%04x:%04x AX=%04x BX=%04x %02x:%02x:%02x:%02x\n" \ +#if 1 + TRACEOUT(("%04x:%04x AX=%04x BX=%04x %02x:%02x:%02x:%02x\n" \ "ES=%04x BP=%04x \nret=%02x", - i286_memword_read(I286_SS, I286_SP+2), - i286_memword_read(I286_SS, I286_SP), - I286_AX, I286_BX, I286_CL, I286_DH, I286_DL, I286_CH, - I286_ES, I286_BP, ret_ah); - TRACE_(buf, 0); - } + i286_memword_read(CPU_SS, CPU_SP+2), + i286_memword_read(CPU_SS, CPU_SP), + CPU_AX, CPU_BX, CPU_CL, CPU_DH, CPU_DL, CPU_CH, + CPU_ES, CPU_BP, ret_ah)); #endif - I286_AH = ret_ah; - flag = i286_membyte_read(I286_SS, I286_SP+4) & 0xfe; + CPU_AH = ret_ah; + flag = i286_membyte_read(CPU_SS, CPU_SP+4) & 0xfe; if (ret_ah >= 0x20) { - flag |= 1; + flag += 1; } - i286_membyte_write(I286_SS, I286_SP+4, flag); + i286_membyte_write(CPU_SS, CPU_SP + 4, flag); }