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

CD-ROM: Actually remember and use the correct number of sectors for the period, fixes... well, any kind of data reading.

Browse Source
This commit is contained in:
OBattler
2025-04-07 05:42:41 +02:00
parent b93af353ef
commit 018ff46253
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/scsi_cdrom.h
View File

@@ -70,6 +70,7 @@ typedef struct scsi_cdrom_t {
int was_cached;
int toc_cached;
int media_access;
int sectors_num;
uint8_t vendor_type;
uint8_t ven_cmd_is_data[256];

13
src/scsi/scsi_cdrom.c
View File

@@ -699,14 +699,9 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
if (dev->was_cached == -1)
period *= (double) dev->packet_len;
else {
int atapi_num = (dev->tf->request_length < dev->block_len) ?
dev->block_len : dev->tf->request_length;
atapi_num = (atapi_num / dev->block_len) * dev->block_len;
if (atapi_num > dev->sector_len)
atapi_num = dev->sector_len;
const int num = ((dev->drv->bus_type == CDROM_BUS_SCSI) ||
(dev->block_len == 0)) ? dev->requested_blocks :
((scsi_cdrom_current_mode(dev) == 2) ? 1 : atapi_num);
(dev->block_len == 0)) ? dev->sectors_num :
((scsi_cdrom_current_mode(dev) == 2) ? 1 : dev->sectors_num);
period *= ((double) num) * 2352.0;
}
@@ -1051,6 +1046,8 @@ scsi_cdrom_read_data(scsi_cdrom_t *dev, const int msf, const int type, const int
int num = (dev->drv->bus_type == CDROM_BUS_SCSI) ?
dev->requested_blocks : 1;
dev->sectors_num = 0;
if (dev->drv->cd_status == CD_STATUS_EMPTY)
scsi_cdrom_not_ready(dev);
else if (dev->sector_pos > dev->drv->cdrom_capacity) {
@@ -1085,6 +1082,7 @@ scsi_cdrom_read_data(scsi_cdrom_t *dev, const int msf, const int type, const int
dev->drv->seek_pos = dev->sector_pos;
dev->sector_len--;
dev->sectors_num++;
dev->buffer_pos += temp_len;
}
@@ -2423,6 +2421,7 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
int32_t *BufLen;
dev->was_cached = -1;
dev->sectors_num = 1;
if (dev->drv->bus_type == CDROM_BUS_SCSI) {
BufLen = &scsi_devices[scsi_bus][scsi_id].buffer_length;