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

CD-ROM: Fix some compile-breaking errors.

Browse Source
This commit is contained in:
OBattler
2025-07-28 13:53:50 +02:00
parent 8426164003
commit 64a19b43b4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cdrom/cdrom.c
View File

@@ -1687,7 +1687,7 @@ cdrom_audio_track_search(cdrom_t *dev, const uint32_t pos,
dev->seek_pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150; dev->seek_pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
else { else {
cdrom_log(dev->log, "Unable to get the starting position for " cdrom_log(dev->log, "Unable to get the starting position for "
"track %08X\n", ismsf & 0xff); "track %08X\n", pos2 & 0xff);
cdrom_stop(dev); cdrom_stop(dev);
} }
break; break;
@@ -1805,7 +1805,7 @@ cdrom_audio_play_toshiba(cdrom_t *dev, const uint32_t pos, const int type)
dev->cd_end = MSFtoLBA(ti.m, ti.s, ti.f) - 150; dev->cd_end = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
else { else {
cdrom_log(dev->log, "Unable to get the starting position for " cdrom_log(dev->log, "Unable to get the starting position for "
"track %08X\n", ismsf & 0xff); "track %08X\n", pos2 & 0xff);
cdrom_stop(dev); cdrom_stop(dev);
} }
break; break;
@@ -1838,7 +1838,7 @@ cdrom_audio_scan(cdrom_t *dev, const uint32_t pos)
uint8_t ret = 0; uint8_t ret = 0;
if (dev->cd_status & CD_STATUS_HAS_AUDIO) { if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
cdrom_log(dev->log, "Audio Scan: MSF = %06x, type = %02x\n", pos, type); cdrom_log(dev->log, "Audio Scan: MSF = %06x\n", pos);
if (pos == 0xffffffff) { if (pos == 0xffffffff) {
cdrom_log(dev->log, "(Type 0) Search from current position\n"); cdrom_log(dev->log, "(Type 0) Search from current position\n");

8
src/cdrom/cdrom_mke.c
View File

@@ -776,16 +776,16 @@ mke_init(const device_t *info)
switch (device_get_config_int("firmware")) { switch (device_get_config_int("firmware")) {
default: default:
case 0: case 0:
mke->ver = "CR-5630.75"; mke->ver = (uint8_t *) "CR-5630.75";
break; break;
case 1: case 1:
mke->ver = "CR-5630.80"; mke->ver = (uint8_t *) "CR-5630.80";
break; break;
case 2: case 2:
mke->ver = "CR-5620.75"; mke->ver = (uint8_t *) "CR-5620.75";
break; break;
case 3: case 3:
mke->ver = "CR-5620.80"; mke->ver = (uint8_t *) "CR-5620.80";
break; break;
} }