80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #776 from 86Box/bugfix/esdi_at_format

Browse Source 
Fixed format issue with the ESDI AT controller in DOS.
This commit is contained in:
OBattler
2020-05-29 01:45:37 +02:00
committed by GitHub
parent 207c5c66a3 9932a5ee32
commit 729aeda336
1 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/disk/hdc_esdi_at.c
View File

@@ -529,13 +529,7 @@ esdi_callback(void *priv)
break; break;
} }
if (hdd_image_read_ex(drive->hdd_num, addr, 1, (uint8_t *)esdi->buffer)) { hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *)esdi->buffer);
esdi->error = ERR_ID_NOT_FOUND;
esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
irq_raise(esdi);
break;
}
esdi->pos = 0; esdi->pos = 0;
esdi->status = STAT_DRQ|STAT_READY|STAT_DSC; esdi->status = STAT_DRQ|STAT_READY|STAT_DSC;
irq_raise(esdi); irq_raise(esdi);
@@ -557,13 +551,7 @@ esdi_callback(void *priv)
break; break;
} }
if (hdd_image_write_ex(drive->hdd_num, addr, 1, (uint8_t *)esdi->buffer)) { hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *)esdi->buffer);
esdi->error = ERR_ID_NOT_FOUND;
esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
irq_raise(esdi);
break;
}
irq_raise(esdi); irq_raise(esdi);
esdi->secount = (esdi->secount - 1) & 0xff; esdi->secount = (esdi->secount - 1) & 0xff;
if (esdi->secount) { if (esdi->secount) {
@@ -590,13 +578,7 @@ esdi_callback(void *priv)
break; break;
} }
if (hdd_image_read_ex(drive->hdd_num, addr, 1, (uint8_t *)esdi->buffer)) { hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *)esdi->buffer);
esdi->error = ERR_ID_NOT_FOUND;
esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
irq_raise(esdi);
break;
}
ui_sb_update_icon(SB_HDD|HDD_BUS_ESDI, 1); ui_sb_update_icon(SB_HDD|HDD_BUS_ESDI, 1);
next_sector(esdi); next_sector(esdi);
esdi->secount = (esdi->secount - 1) & 0xff; esdi->secount = (esdi->secount - 1) & 0xff;
@@ -624,13 +606,7 @@ esdi_callback(void *priv)
break; break;
} }
if (hdd_image_zero_ex(drive->hdd_num, addr, esdi->secount)) { hdd_image_zero(drive->hdd_num, addr, esdi->secount);
esdi->error = ERR_ID_NOT_FOUND;
esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
irq_raise(esdi);
break;
}
esdi->status = STAT_READY|STAT_DSC; esdi->status = STAT_READY|STAT_DSC;
irq_raise(esdi); irq_raise(esdi);
ui_sb_update_icon(SB_HDD|HDD_BUS_ESDI, 1); ui_sb_update_icon(SB_HDD|HDD_BUS_ESDI, 1);
@@ -829,8 +805,8 @@ wd1007vse1_init(const device_t *info)
esdi_read, esdi_readw, NULL, esdi_read, esdi_readw, NULL,
esdi_write, esdi_writew, NULL, esdi); esdi_write, esdi_writew, NULL, esdi);
io_sethandler(0x01f1, 7, io_sethandler(0x01f1, 7,
esdi_read, NULL, NULL, esdi_read, esdi_readw, NULL,
esdi_write, NULL, NULL, esdi); esdi_write, esdi_writew, NULL, esdi);
io_sethandler(0x03f6, 1, NULL, NULL, NULL, io_sethandler(0x03f6, 1, NULL, NULL, NULL,
esdi_write, NULL, NULL, esdi); esdi_write, NULL, NULL, esdi);