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

ATAPI CD-ROM: Add 512 µs to the access time of non-medium-access commands to avoid them being too quick, fixes too slow waiting times on the two AMI 7 STPC Acrossers.

Browse Source
This commit is contained in:
OBattler
2025-08-08 18:06:37 +02:00
parent e6af4225a0
commit ce9c40e058
1 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/scsi/scsi_cdrom.c
View File

@@ -645,19 +645,16 @@ scsi_cdrom_bus_speed(scsi_cdrom_t *dev)
{
double ret = -1.0;
if (dev && dev->drv && (dev->drv->bus_type == CDROM_BUS_SCSI)) {
dev->callback = -1.0; /* Speed depends on SCSI controller */
return 0.0;
} else {
if (dev && dev->drv)
ret = ide_atapi_get_period(dev->drv->ide_channel);
if (ret == -1.0) {
if (dev)
dev->callback = -1.0;
return 0.0;
} else
return 1000000.0 / ret;
if (dev && dev->drv)
ret = ide_atapi_get_period(dev->drv->ide_channel);
if (ret == -1.0) {
if (dev)
dev->callback = -1.0;
ret = 0.0;
}
return ret;
}
static void
@@ -671,7 +668,12 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
double bytes_per_second;
double period;
if (dev->was_cached != -1) {
if (dev->was_cached == -1) {
if (dev->drv->bus_type == CDROM_BUS_SCSI)
dev->callback = -1.0; /* Speed depends on SCSI controller */
else
dev->callback = 512.0 + (scsi_cdrom_bus_speed(dev) * (double) (dev->packet_len));
} else {
if (dev->was_cached) {
dev->callback += 512.0;
scsi_cdrom_set_callback(dev);
@@ -686,27 +688,21 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
/* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed;
} else {
bytes_per_second = scsi_cdrom_bus_speed(dev);
if (bytes_per_second == 0.0) {
dev->callback = -1; /* Speed depends on SCSI controller */
return;
period = 1000000.0 / bytes_per_second;
scsi_cdrom_log(dev->log, "Byte transfer period: %lf us\n", period);
if (dev->was_cached == -1)
period *= (double) dev->packet_len;
else {
const int num = ((dev->drv->bus_type == CDROM_BUS_SCSI) ||
(dev->block_len == 0)) ? dev->sectors_num :
((scsi_cdrom_current_mode(dev) == 2) ? 1 : dev->sectors_num);
period *= ((double) num) * 2352.0;
}
scsi_cdrom_log(dev->log, "Sector transfer period: %lf us\n", period);
dev->callback += period;
}
period = 1000000.0 / bytes_per_second;
scsi_cdrom_log(dev->log, "Byte transfer period: %lf us\n", period);
if (dev->was_cached == -1)
period *= (double) dev->packet_len;
else {
const int num = ((dev->drv->bus_type == CDROM_BUS_SCSI) ||
(dev->block_len == 0)) ? dev->sectors_num :
((scsi_cdrom_current_mode(dev) == 2) ? 1 : dev->sectors_num);
period *= ((double) num) * 2352.0;
}
scsi_cdrom_log(dev->log, "Sector transfer period: %lf us\n", period);
dev->callback += period;
}
scsi_cdrom_set_callback(dev);
}