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

1x CD-ROM speed is 176400 bytes per second, not 176 * 1024 bytes per second.

Browse Source
This commit is contained in:
OBattler
2023-12-30 19:40:05 +01:00
parent 76aab06e9b
commit 0265b34384
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/scsi/scsi_cdrom.c
View File

@@ -990,7 +990,8 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
if (dev->current_cdb[0] == 0x42) if (dev->current_cdb[0] == 0x42)
dev->callback += 40.0; dev->callback += 40.0;
/* Account for seek time. */ /* Account for seek time. */
bytes_per_second = 176.0 * 1024.0; /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
break; break;
case 0xc6 ... 0xc7: case 0xc6 ... 0xc7:
@@ -1011,7 +1012,8 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
case CDROM_TYPE_SONY_CDU561_18k: case CDROM_TYPE_SONY_CDU561_18k:
case CDROM_TYPE_SONY_CDU76S_100: case CDROM_TYPE_SONY_CDU76S_100:
case CDROM_TYPE_TEXEL_DMXX24_100: case CDROM_TYPE_TEXEL_DMXX24_100:
bytes_per_second = 176.0 * 1024.0; /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
break; break;
} }
@@ -1023,7 +1025,8 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
case CDROM_TYPE_SONY_CDU76S_100: case CDROM_TYPE_SONY_CDU76S_100:
case CDROM_TYPE_PIONEER_DRM604X_2403: case CDROM_TYPE_PIONEER_DRM604X_2403:
case CDROM_TYPE_TEXEL_DMXX24_100: case CDROM_TYPE_TEXEL_DMXX24_100:
bytes_per_second = 176.0 * 1024.0; /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
break; break;
} }
@@ -1037,7 +1040,8 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
case CDROM_TYPE_TEXEL_DMXX24_100: case CDROM_TYPE_TEXEL_DMXX24_100:
if (dev->current_cdb[0] == 0xc2) if (dev->current_cdb[0] == 0xc2)
dev->callback += 40.0; dev->callback += 40.0;
bytes_per_second = 176.0 * 1024.0; /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
break; break;
} }
@@ -1049,7 +1053,8 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
case CDROM_TYPE_NEC_77_106: case CDROM_TYPE_NEC_77_106:
case CDROM_TYPE_NEC_211_100: case CDROM_TYPE_NEC_211_100:
case CDROM_TYPE_NEC_464_105: case CDROM_TYPE_NEC_464_105:
bytes_per_second = 176.0 * 1024.0; /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
break; break;
} }