Large changes to configuration files again (the old ones might break, be careful);

Applied the mainline PCem slight CPU emulation speedup commit;
Added emulation of removable SCSI hard disks;
CD-ROM image handler now uses C FILE's (with the 64-bit size calls) instead of C++ iostreams, ISO images bigger than 2 GB should work properly again;
Split RLL/ESDI and XT IDE disks to their own bus types;
Turned status bar pane meaning and hard disks and CD-ROM BUS numbers to #define's;
Other miscellaneous cleanups.
This commit is contained in:
OBattler
2017-05-27 03:53:32 +02:00
parent 94680da416
commit a36720f174
56 changed files with 4736 additions and 2682 deletions

View File

@@ -374,7 +374,7 @@ static void xebec_callback(void *p)
xebec_complete(xebec);
update_status_bar_icon(0x30, 1);
update_status_bar_icon(SB_HDD | HDD_BUS_MFM, 1);
break;
default:
@@ -431,7 +431,7 @@ static void xebec_callback(void *p)
fseeko64(drive->hdfile, addr * 512, SEEK_SET);
fread(xebec->sector_buf, 512, 1, drive->hdfile);
update_status_bar_icon(0x30, 1);
update_status_bar_icon(SB_HDD | HDD_BUS_MFM, 1);
}
if (xebec->irq_dma_mask & DMA_ENA)
xebec->callback = XEBEC_TIME;
@@ -485,7 +485,7 @@ static void xebec_callback(void *p)
fseeko64(drive->hdfile, addr * 512, SEEK_SET);
fread(xebec->sector_buf, 512, 1, drive->hdfile);
update_status_bar_icon(0x30, 1);
update_status_bar_icon(SB_HDD | HDD_BUS_MFM, 1);
xebec->state = STATE_SEND_DATA;
@@ -500,7 +500,7 @@ static void xebec_callback(void *p)
else
{
xebec_complete(xebec);
update_status_bar_icon(0x30, 0);
update_status_bar_icon(SB_HDD | HDD_BUS_MFM, 0);
}
break;
@@ -572,7 +572,7 @@ static void xebec_callback(void *p)
fwrite(xebec->sector_buf, 512, 1, drive->hdfile);
}
update_status_bar_icon(0x30, 1);
update_status_bar_icon(SB_HDD | HDD_BUS_MFM, 1);
xebec_next_sector(xebec);
xebec->data_pos = 0;
@@ -851,9 +851,9 @@ static void *xebec_init()
for (i = 0; i < HDC_NUM; i++)
{
if ((hdc[i].bus == 1) && (hdc[i].mfm_channel < MFM_NUM))
if ((hdc[i].bus == HDD_BUS_MFM) && (hdc[i].mfm_channel < MFM_NUM))
{
loadhd(xebec, i, hdc[i].mfm_channel, hdd_fn[i]);
loadhd(xebec, i, hdc[i].mfm_channel, hdc[i].fn);
c++;
if (c > MFM_NUM) break;
}
@@ -914,9 +914,9 @@ static void *dtc_5150x_init()
for (i = 0; i < HDC_NUM; i++)
{
if ((hdc[i].bus == 1) && (hdc[i].mfm_channel < MFM_NUM))
if ((hdc[i].bus == HDD_BUS_MFM) && (hdc[i].mfm_channel < MFM_NUM))
{
loadhd(xebec, i, hdc[i].mfm_channel, hdd_fn[i]);
loadhd(xebec, i, hdc[i].mfm_channel, hdc[i].fn);
c++;
if (c > MFM_NUM) break;
}