mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #5846 from Cacodemon345/mke-fixes-2

Browse Source 
Panasonic/MKE OS freeze fixes (redo)
This commit is contained in:
Miran Grča
2025-07-30 21:10:04 +02:00
committed by GitHub
parent 076f8db5c7 bc6480f0c4
commit be80bd634b
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/cdrom/cdrom_mke.c
View File

@@ -160,6 +160,13 @@ mke_log(const char *fmt, ...)
return; \
}
#define REPORT_IF_NOT_READY() \
{ \
if (!mke_pre_execution_check(mke)) { \
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke)); \
} \
}
#define CHECK_READY_READ() \
{ \
if (!mke_pre_execution_check(mke)) { \
@@ -523,7 +530,7 @@ mke_command(mke_t *mke, uint8_t value)
{
uint16_t i;
/* This is wasteful handling of buffers for compatibility, but will optimize later. */
uint8_t x[12];
uint8_t x[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int old_cd_status;
if (mke->command_buffer_pending) {
@@ -601,8 +608,9 @@ mke_command(mke_t *mke, uint8_t value)
}
break;
} case CMD1_READSUBQ:
CHECK_READY();
mke_get_subq(mke, (uint8_t *) &x);
if (mke_pre_execution_check(mke)) {
mke_get_subq(mke, (uint8_t *) &x);
}
fifo8_reset(&mke->info_fifo);
fifo8_push_all(&mke->info_fifo, x, 11);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
@@ -630,6 +638,7 @@ mke_command(mke_t *mke, uint8_t value)
if (!sector_size) {
mke_update_sense(mke, 0x0e);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
return;
} else {
switch (sector_size) {
@@ -665,6 +674,7 @@ mke_command(mke_t *mke, uint8_t value)
break;
default:
mke_update_sense(mke, 0x0e);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
return;
}
}
@@ -676,6 +686,7 @@ mke_command(mke_t *mke, uint8_t value)
break;
default:
mke_update_sense(mke, 0x0e);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
return;
}
@@ -701,45 +712,45 @@ mke_command(mke_t *mke, uint8_t value)
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_PAUSERESUME:
CHECK_READY();
CHECK_READY_READ();
cdrom_audio_pause_resume(mke->cdrom_dev, mke->command_buffer[1] >> 7);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_CAPACITY:
/* 6 */
mke_log("DISK CAPACITY\n");
CHECK_READY();
mke_disc_capacity(mke->cdrom_dev, (uint8_t *) &x);
if (mke_pre_execution_check(mke))
mke_disc_capacity(mke->cdrom_dev, (uint8_t *) &x);
fifo8_push_all(&mke->info_fifo, x, 5);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_DISKINFO:
/* 7 */
mke_log("DISK INFO\n");
CHECK_READY();
mke_disc_info(mke, (uint8_t *) &x);
fifo8_reset(&mke->info_fifo);
if (mke_pre_execution_check(mke))
mke_disc_info(mke, (uint8_t *) &x);
fifo8_push_all(&mke->info_fifo, x, 6);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_READTOC:
CHECK_READY();
fifo8_reset(&mke->info_fifo);
mke_read_toc(mke, (uint8_t *) &x, mke->command_buffer[2]);
if (mke_pre_execution_check(mke))
mke_read_toc(mke, (uint8_t *) &x, mke->command_buffer[2]);
fifo8_push_all(&mke->info_fifo, x, 8);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_PLAY_TI:
CHECK_READY();
/* Index is ignored for now. */
fifo8_reset(&mke->info_fifo);
if (cdrom_audio_play(mke->cdrom_dev, mke->command_buffer[1], mke->command_buffer[3], 2))
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
else
CHECK_READY_READ();
if (!cdrom_audio_play(mke->cdrom_dev, mke->command_buffer[1], mke->command_buffer[3], 2))
mke_update_sense(mke, 0x10);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_PLAY_MSF:
CHECK_READY();
fifo8_reset(&mke->info_fifo);
CHECK_READY_READ();
mke_log("PLAY MSF:");
for (i = 0; i < 6; i++) {
mke_log("%02x ", mke->command_buffer[i + 1]);
@@ -751,16 +762,16 @@ mke_command(mke_t *mke, uint8_t value)
mke->command_buffer[3];
int len = (mke->command_buffer[4] << 16) | (mke->command_buffer[5] << 8) |
mke->command_buffer[6];
if (!cdrom_audio_play(mke->cdrom_dev, pos, len, msf))
if (!cdrom_audio_play(mke->cdrom_dev, pos, len, msf)){
mke_update_sense(mke, 0x10);
else
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
}
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
}
break;
case CMD1_SEEK:
CHECK_READY();
old_cd_status = mke->cdrom_dev->cd_status;
fifo8_reset(&mke->info_fifo);
CHECK_READY_READ();
/* TODO: DOES THIS IMPACT CURRENT PLAY LENGTH? */
mke_log("SEEK MSF:");
for (i = 0; i < 6; i++) {
@@ -778,18 +789,20 @@ mke_command(mke_t *mke, uint8_t value)
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_SESSINFO:
CHECK_READY();
fifo8_reset(&mke->info_fifo);
mke_log("CMD: READ SESSION INFO\n");
mke_read_multisess(mke);
if (mke_pre_execution_check(mke))
mke_read_multisess(mke);
else
fifo8_push_all(&mke->info_fifo, x, 6);
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_READ_UPC:
CHECK_READY();
fifo8_reset(&mke->info_fifo);
mke_log("CMD: READ UPC\n");
uint8_t upc[8] = { [0] = 80 };
fifo8_push_all(&mke->info_fifo, upc, 8);
REPORT_IF_NOT_READY();
fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
break;
case CMD1_READ_ERR: