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

Fixed ATAPI PIO operation and ATAPI DMA timings.

Browse Source
This commit is contained in:
OBattler
2025-02-13 04:28:05 +01:00
parent 9a1ae5997f
commit 8a66dbef37
2 changed files with 125 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/disk/hdc_ide.c
View File

@@ -241,6 +241,7 @@ int ide_qua_enabled = 0;
static void ide_atapi_callback(ide_t *ide); static void ide_atapi_callback(ide_t *ide);
static void ide_callback(void *priv); static void ide_callback(void *priv);
// #define ENABLE_IDE_LOG 1
#ifdef ENABLE_IDE_LOG #ifdef ENABLE_IDE_LOG
int ide_do_log = ENABLE_IDE_LOG; int ide_do_log = ENABLE_IDE_LOG;
@@ -1091,6 +1092,7 @@ ide_atapi_callback(ide_t *ide)
ide_irq_raise(ide); ide_irq_raise(ide);
break; break;
case PHASE_DATA_IN_DMA: case PHASE_DATA_IN_DMA:
pclog("Reading block %i... ", ide->sc->sector_len + 1);
if (!IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 && if (!IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 &&
(bm != NULL) && bm->dma) { (bm != NULL) && bm->dma) {
if (ide->sc->block_len == 0) if (ide->sc->block_len == 0)
@@ -1114,13 +1116,16 @@ ide_atapi_callback(ide_t *ide)
default: default:
break; break;
case 0: case 0:
pclog("ERROR\n");
if (ide->bus_master_error) if (ide->bus_master_error)
ide->bus_master_error(ide->sc); ide->bus_master_error(ide->sc);
break; break;
case 2: case 2:
pclog("WAIT\n");
ide_atapi_command_bus(ide); ide_atapi_command_bus(ide);
break; break;
case 3: case 3:
pclog("DONE\n");
/* Reached EOT - terminate the command as there's nothing /* Reached EOT - terminate the command as there's nothing
more to transfer. */ more to transfer. */
ide->sc->packet_status = PHASE_COMPLETE; ide->sc->packet_status = PHASE_COMPLETE;
@@ -1130,6 +1135,7 @@ ide_atapi_callback(ide_t *ide)
ide->command_stop(ide->sc); ide->command_stop(ide->sc);
fallthrough; fallthrough;
case 1: case 1:
pclog("NEXT\n");
if ((ide->sc->packet_status == PHASE_COMPLETE) && if ((ide->sc->packet_status == PHASE_COMPLETE) &&
(ide->sc->callback == 0.0)) (ide->sc->callback == 0.0))
ide_atapi_callback(ide); ide_atapi_callback(ide);
@@ -1193,21 +1199,15 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
ide_irq_lower(ide); ide_irq_lower(ide);
ide->tf->atastat = BSY_STAT; ide->tf->atastat = BSY_STAT;
if (ide->tf->pos >= dev->packet_len) { if (ide->tf->pos >= dev->packet_len) {
ide_log("%i bytes %s, command done\n", ide->tf->pos, out ? "written" : "read"); ide_log("%i bytes %s, command done\n", ide->tf->pos, out ? "written" : "read");
ide->tf->pos = dev->request_pos = 0; ide->tf->pos = dev->request_pos = 0;
if (dev->block_len != 0) { if (dev->block_len == 0) {
if (out && (ide->write != NULL)) // pclog("ide_atapi_pio_request(): Processing instant command...\n");
ide->write(dev);
else if (!out && (dev->sector_len != 0) && (ide->read != NULL))
ide->read(dev);
}
if ((dev->block_len == 0) || (dev->sector_len == 0)) {
if (out && (ide->phase_data_out != NULL)) if (out && (ide->phase_data_out != NULL))
ide->phase_data_out(dev); ide->phase_data_out(dev);
else if (!out && (ide->command_stop != NULL)) else if (!out && (ide->command_stop != NULL))
@@ -1237,22 +1237,62 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
dev->packet_status = PHASE_DATA_IN | out; dev->packet_status = PHASE_DATA_IN | out;
if (dev->block_len != 0) { if (dev->block_len == 0) {
if (out && (ide->write != NULL))
ide->write(dev);
else if (!out && (dev->sector_len != 0) && (ide->read != NULL))
ide->read(dev);
}
ide->tf->atastat = BSY_STAT;
ide->tf->phase = 1;
if ((dev->block_len == 0) || (dev->sector_len == 0)) {
ide_atapi_callback(ide); ide_atapi_callback(ide);
ide_set_callback(ide, 0.0); ide_set_callback(ide, 0.0);
} }
dev->request_pos = 0; dev->request_pos = 0;
}
if (dev->block_len != 0) {
if (out) {
if (ide->write != NULL) {
#if 0
pclog("ide_atapi_pio_request(): Continuing write command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
ide->write(dev);
}
if (dev->sector_len == 0) {
#if 0
pclog("ide_atapi_pio_request(): Ending write command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
ide->sc->packet_status = PHASE_COMPLETE;
ide->sc->callback = 0.0;
if (ide->phase_data_out != NULL)
(void) ide->phase_data_out(dev);
ide_atapi_callback(ide);
}
} else {
if (dev->sector_len == 0) {
#if 0
pclog("ide_atapi_pio_request(): Ending read command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
if (ide->command_stop != NULL)
ide->command_stop(dev);
ide->sc->packet_status = PHASE_COMPLETE;
ide->sc->callback = 0.0;
ide_atapi_callback(ide);
} else if (ide->read != NULL) {
#if 0
pclog("ide_atapi_pio_request(): Continuing read command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
ide->read(dev);
}
}
} }
} }
@@ -1284,11 +1324,27 @@ ide_atapi_packet_read(ide_t *ide)
(ide->tf->pos >= dev->packet_len)) { (ide->tf->pos >= dev->packet_len)) {
/* Time for a DRQ. */ /* Time for a DRQ. */
ide_atapi_pio_request(ide, 0); ide_atapi_pio_request(ide, 0);
} else if ((dev->block_len != 0) && }
#if 0
else if ((dev->block_len != 0) &&
(dev->sector_len != 0) && (dev->sector_len != 0) &&
((dev->request_pos % dev->block_len) == 0) && ((dev->request_pos % dev->block_len) == 0)) {
(ide->read != NULL)) if (dev->sector_len == 0) {
ide->read(dev); // pclog("ide_atapi_packet_read(): Ending read command (dev->sector_len = %i)...\n", dev->sector_len);
if (ide->command_stop != NULL)
ide->command_stop(ide->sc);
ide->sc->packet_status = PHASE_COMPLETE;
ide->sc->callback = 0.0;
ide_atapi_callback(ide);
} else if (ide->read != NULL) {
// pclog("ide_atapi_packet_read(): Continuing read command (dev->sector_len = %i)...\n", dev->sector_len);
ide->read(dev);
}
}
#endif
} }
return ret; return ret;
@@ -1322,10 +1378,16 @@ ide_atapi_packet_write(ide_t *ide, const uint16_t val)
(ide->tf->pos >= dev->packet_len)) { (ide->tf->pos >= dev->packet_len)) {
/* Time for a DRQ. */ /* Time for a DRQ. */
ide_atapi_pio_request(ide, 1); ide_atapi_pio_request(ide, 1);
} else if ((dev->block_len != 0) && }
#if 0
else if ((dev->block_len != 0) &&
((dev->request_pos % dev->block_len) == 0) && ((dev->request_pos % dev->block_len) == 0) &&
(ide->write != NULL)) (ide->write != NULL)) {
// pclog("ide_atapi_packet_write(): Continuing write command (dev->sector_len = %i)...\n", dev->sector_len);
ide->write(dev); ide->write(dev);
}
#endif
} else if (dev->packet_status == PHASE_IDLE) { } else if (dev->packet_status == PHASE_IDLE) {
if (ide->tf->pos >= 12) { if (ide->tf->pos >= 12) {
ide->tf->pos = 0; ide->tf->pos = 0;

62
src/scsi/scsi_cdrom.c
View File

@@ -15,6 +15,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include <math.h> #include <math.h>
// #define ENABLE_SCSI_CDROM_LOG 2
#ifdef ENABLE_SCSI_CDROM_LOG #ifdef ENABLE_SCSI_CDROM_LOG
#include <stdarg.h> #include <stdarg.h>
#endif #endif
@@ -611,8 +612,8 @@ scsi_cdrom_update_request_length(scsi_cdrom_t *dev, int len, const int block_len
} }
} }
if (dev->drv->bus_type != CDROM_BUS_SCSI) if ((dev->drv->bus_type != CDROM_BUS_SCSI) && (dev->block_len != 0))
dev->requested_blocks = 1; dev->requested_blocks = (dev->packet_len / dev->block_len);
fallthrough; fallthrough;
default: default:
@@ -667,9 +668,9 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
scsi_cdrom_log(dev->log, "Current speed: %ix\n", dev->drv->cur_speed); scsi_cdrom_log(dev->log, "Current speed: %ix\n", dev->drv->cur_speed);
if (dev->packet_status == PHASE_COMPLETE) dev->callback = 0;
dev->callback = 0;
else { if (dev->packet_status != PHASE_COMPLETE) {
double bytes_per_second; double bytes_per_second;
double period; double period;
@@ -689,6 +690,7 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
/* 44100 * 16 bits * 2 channels = 176400 bytes per second */ /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0; bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
// pclog("Current speed: %ix\n", dev->drv->cur_speed);
} else { } else {
bytes_per_second = scsi_cdrom_bus_speed(dev); bytes_per_second = scsi_cdrom_bus_speed(dev);
if (bytes_per_second == 0.0) { if (bytes_per_second == 0.0) {
@@ -703,8 +705,11 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
if (dev->was_cached == -1) if (dev->was_cached == -1)
period *= (double) dev->packet_len; period *= (double) dev->packet_len;
else { else {
const int num = (dev->drv->bus_type == CDROM_BUS_SCSI) ? const int num = ((dev->drv->bus_type == CDROM_BUS_SCSI) ||
dev->requested_blocks : 1; (dev->block_len == 0)) ?
dev->requested_blocks :
((scsi_cdrom_current_mode(dev) == 2) ? 1 :
(dev->packet_len / dev->block_len));
period *= ((double) num) * 2352.0; period *= ((double) num) * 2352.0;
pclog("[%02X] Calculated period for %i * 2352 bytes\n", cmd, num); pclog("[%02X] Calculated period for %i * 2352 bytes\n", cmd, num);
@@ -1045,7 +1050,7 @@ scsi_cdrom_read_data(scsi_cdrom_t *dev, const int msf, const int type, const int
{ {
int temp_len = 0; int temp_len = 0;
int ret = 0; int ret = 0;
const int num = (dev->drv->bus_type == CDROM_BUS_SCSI) ? int num = (dev->drv->bus_type == CDROM_BUS_SCSI) ?
dev->requested_blocks : 1; dev->requested_blocks : 1;
if (dev->drv->cd_status == CD_STATUS_EMPTY) if (dev->drv->cd_status == CD_STATUS_EMPTY)
@@ -1065,15 +1070,20 @@ scsi_cdrom_read_data(scsi_cdrom_t *dev, const int msf, const int type, const int
else if (ret == 0) else if (ret == 0)
scsi_cdrom_illegal_mode(dev); scsi_cdrom_illegal_mode(dev);
else { else {
if (dev->block_len == 0xffffffff) if (dev->block_len == 0xffffffff) {
dev->block_len = temp_len; dev->block_len = temp_len;
if ((dev->drv->bus_type != CDROM_BUS_SCSI) &&
(scsi_cdrom_current_mode(dev) != 2))
num = (dev->packet_len / dev->block_len);
}
dev->sector_pos++; dev->sector_pos++;
dev->drv->seek_pos = dev->sector_pos; dev->drv->seek_pos = dev->sector_pos;
dev->sector_len--; dev->sector_len--;
pclog("Sector read to buffer position %08X\n", dev->buffer_pos); // pclog("Sector read to buffer position %08X\n", dev->buffer_pos);
dev->buffer_pos += temp_len; dev->buffer_pos += temp_len;
} }
} }
@@ -1547,17 +1557,17 @@ static void
scsi_cdrom_read(scsi_common_t *sc) scsi_cdrom_read(scsi_common_t *sc)
{ {
scsi_cdrom_t *dev = (scsi_cdrom_t *) sc; scsi_cdrom_t *dev = (scsi_cdrom_t *) sc;
const int osl = dev->sector_len;
const int ret = scsi_cdrom_read_blocks(dev); const int ret = scsi_cdrom_read_blocks(dev);
dev->drv->seek_diff = 0; dev->drv->seek_diff = 0;
if (ret > 0) { if (ret > 0) {
if (dev->packet_status != PHASE_COMPLETE) { if (osl > 0)
ui_sb_update_icon(SB_CDROM | dev->id, 1);
scsi_cdrom_set_period(dev); scsi_cdrom_set_period(dev);
} else
ui_sb_update_icon(SB_CDROM | dev->id, 0); ui_sb_update_icon(SB_CDROM | dev->id,
(dev->packet_status != PHASE_COMPLETE));
} else } else
scsi_cdrom_media_access_complete(dev, ret); scsi_cdrom_media_access_complete(dev, ret);
} }
@@ -2461,7 +2471,7 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
break; break;
case GPCMD_REZERO_UNIT: case GPCMD_REZERO_UNIT:
pclog("Rezero unit\n"); // pclog("Rezero unit\n");
dev->was_cached = 0; dev->was_cached = 0;
scsi_cdrom_stop(sc); scsi_cdrom_stop(sc);
dev->requested_blocks = 0; dev->requested_blocks = 0;
@@ -2496,7 +2506,7 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
case GPCMD_SCAN_PIONEER: case GPCMD_SCAN_PIONEER:
case GPCMD_AUDIO_SCAN: case GPCMD_AUDIO_SCAN:
pclog("Audio scan\n"); // pclog("Audio scan\n");
scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS); scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
dev->was_cached = 0; dev->was_cached = 0;
@@ -2543,7 +2553,7 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
scsi_cdrom_buf_alloc(dev, 65536); scsi_cdrom_buf_alloc(dev, 65536);
toc_format = cdb[2] & 0xf; toc_format = cdb[2] & 0xf;
pclog("READ TOC format %1X\n", toc_format); // pclog("READ TOC format %1X\n", toc_format);
if (toc_format == 0) if (toc_format == 0)
toc_format = (cdb[9] >> 6) & 3; toc_format = (cdb[9] >> 6) & 3;
@@ -3161,20 +3171,20 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
msf = 0; msf = 0;
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[7] << 8) | cdb[8]; len = (cdb[7] << 8) | cdb[8];
pclog("Play audio (10)\n"); // pclog("Play audio (10)\n");
break; break;
case GPCMD_PLAY_AUDIO_12: case GPCMD_PLAY_AUDIO_12:
msf = 0; msf = 0;
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9]; len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
pclog("Play audio (12)\n"); // pclog("Play audio (12)\n");
break; break;
case GPCMD_PLAY_AUDIO_MSF: case GPCMD_PLAY_AUDIO_MSF:
msf = 1; msf = 1;
pos = (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 16) | (cdb[7] << 8) | cdb[8]; len = (cdb[6] << 16) | (cdb[7] << 8) | cdb[8];
pclog("Play audio MSF: %2i:%02i.%02i-%2i:%02i.%02i\n", // pclog("Play audio MSF: %2i:%02i.%02i-%2i:%02i.%02i\n",
cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8]); // cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8]);
break; break;
case GPCMD_PLAY_AUDIO_TRACK_INDEX: case GPCMD_PLAY_AUDIO_TRACK_INDEX:
msf = 2; msf = 2;
@@ -3183,19 +3193,19 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
len = cdb[7]; len = cdb[7];
} else } else
ret = 0; ret = 0;
pclog("Play audio track index\n"); // pclog("Play audio track index\n");
break; break;
case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10: case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10:
msf = 0x100 | cdb[6]; msf = 0x100 | cdb[6];
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[7] << 8) | cdb[8]; len = (cdb[7] << 8) | cdb[8];
pclog("Play audio track relative (10)\n"); // pclog("Play audio track relative (10)\n");
break; break;
case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12: case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12:
msf = 0x100 | cdb[10]; msf = 0x100 | cdb[10];
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9]; len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
pclog("Play audio track relative (12)\n"); // pclog("Play audio track relative (12)\n");
break; break;
default: default:
@@ -3495,7 +3505,7 @@ atapi_out:
case GPCMD_SEEK_6: case GPCMD_SEEK_6:
case GPCMD_SEEK_10: case GPCMD_SEEK_10:
pclog("Seek\n"); // pclog("Seek\n");
scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS); scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
dev->was_cached = 0; dev->was_cached = 0;