claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hdc_st506: Report image read/write errors

Browse Source
This commit is contained in:
RichardG867
2024-10-29 12:49:21 -03:00
parent ed0c571a8e
commit 5734fd9a55
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/disk/hdc_st506_at.c
View File

@@ -585,12 +585,16 @@ do_callback(void *priv)
do_seek(mfm);
if (get_sector(mfm, &addr)) {
mfm->error = ERR_ID_NOT_FOUND;
read_error:
mfm->status = STAT_READY | STAT_DSC | STAT_ERR;
irq_raise(mfm);
break;
}
hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer);
if (hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer) < 0) {
mfm->error = ERR_BAD_BLOCK;
goto read_error;
}
mfm->pos = 0;
mfm->status = STAT_DRQ | STAT_READY | STAT_DSC;
@@ -604,12 +608,16 @@ do_callback(void *priv)
do_seek(mfm);
if (get_sector(mfm, &addr)) {
mfm->error = ERR_ID_NOT_FOUND;
write_error:
mfm->status = STAT_READY | STAT_DSC | STAT_ERR;
irq_raise(mfm);
break;
}
hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer);
if (hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer) < 0) {
mfm->error = ERR_BAD_BLOCK;
goto write_error;
}
irq_raise(mfm);
mfm->secount = (mfm->secount - 1) & 0xff;

32
src/disk/hdc_st506_xt.c
View File

@@ -715,6 +715,7 @@ st506_callback(void *priv)
dev->head, dev->sector, dev->count);
if (!get_sector(dev, drive, &addr)) {
read_error_start:
st506_error(dev, dev->error);
st506_complete(dev);
return;
@@ -722,8 +723,11 @@ st506_callback(void *priv)
ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
/* Read data from the image. */
hdd_image_read(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff);
if (hdd_image_read(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff) < 0) {
dev->error = ERR_UNC_ERR;
goto read_error_start;
}
/* Set up the data transfer. */
dev->buff_pos = 0;
@@ -765,6 +769,7 @@ st506_callback(void *priv)
next_sector(dev, drive);
if (!get_sector(dev, drive, &addr)) {
read_error_sent:
ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
st506_error(dev, dev->error);
st506_complete(dev);
@@ -772,8 +777,11 @@ st506_callback(void *priv)
}
/* Read data from the image. */
hdd_image_read(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff);
if (hdd_image_read(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff) < 0) {
dev->error = ERR_UNC_ERR;
goto read_error_sent;
}
/* Set up the data transfer. */
dev->buff_pos = 0;
@@ -856,6 +864,7 @@ st506_callback(void *priv)
case STATE_RECEIVED_DATA:
if (!get_sector(dev, drive, &addr)) {
write_error:
ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
st506_error(dev, dev->error);
st506_complete(dev);
@@ -863,8 +872,11 @@ st506_callback(void *priv)
}
/* Write data to image. */
hdd_image_write(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff);
if (hdd_image_write(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff) < 0) {
dev->error = ERR_UNC_ERR;
goto write_error;
}
if (--dev->count == 0) {
ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
@@ -1156,8 +1168,12 @@ st506_callback(void *priv)
ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
/* Write data to image. */
hdd_image_write(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff);
if (hdd_image_write(drive->hdd_num, addr, 1,
(uint8_t *) dev->buff) < 0) {
st506_error(dev, ERR_UNC_ERR);
st506_complete(dev);
return;
}
if (--dev->count == 0) {
ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);