From 1ce96a0624badabb3e3a183ecfd540acf127a847 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 4 Nov 2023 02:51:56 -0400 Subject: [PATCH 1/4] Remove unnecessary brace in m_at_socket370.c --- src/machine/m_at_socket370.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c index db6013ae1..07432bfd7 100644 --- a/src/machine/m_at_socket370.c +++ b/src/machine/m_at_socket370.c @@ -173,9 +173,8 @@ machine_at_p6bat_init(const machine_t *model) device_add(&sst_flash_39sf020_device); spd_register(SPD_TYPE_SDRAM, 0x7, 256); - if (sound_card_current[0] == SOUND_INTERNAL) { + if (sound_card_current[0] == SOUND_INTERNAL) device_add(&cmi8738_onboard_device); - } return ret; } From 85f358b7f5f9573339618cc4defd0eb7a6372074 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 4 Nov 2023 23:16:08 +0100 Subject: [PATCH 2/4] Removed the recently introduced IDE reset change - fixes CD-ROM detection on Windows 95 on Phoenix BIOS'es. --- src/disk/hdc_ide.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index 14ceb6504..7a89c105f 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -1336,10 +1336,6 @@ ide_write_devctl(UNUSED(uint16_t addr), uint8_t val, void *priv) uint8_t old; ch = dev->cur_dev; - /* ATA/ATAPI specification: On a slave with non-present master, pretend the - master is selected. */ - if (ide_drives[ch]->type & IDE_SHADOW) - ch ^= 1; ide = ide_drives[ch]; ide_other = ide_drives[ch ^ 1]; From c8f6c0f3c49b99b78bd58ec7e0bd42513327b33a Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 5 Nov 2023 00:53:57 +0100 Subject: [PATCH 3/4] Moved the CPU override warning dialog so it no longer hard freezes the emulator. --- src/qt/qt_main.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index 598025795..d025c9168 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -208,6 +208,20 @@ main(int argc, char *argv[]) return 0; } + /* Warn the user about unsupported configs */ + if (cpu_override) { + QMessageBox warningbox(QMessageBox::Icon::Warning, QObject::tr("You are loading an unsupported configuration"), + QObject::tr("CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."), + QMessageBox::NoButton, main_window); + warningbox.addButton(QObject::tr("Continue"), QMessageBox::AcceptRole); + warningbox.addButton(QObject::tr("Exit"), QMessageBox::RejectRole); + warningbox.exec(); + if (warningbox.result() == QDialog::Accepted) { + confirm_exit_cmdl = 0; /* skip the confirmation prompt without touching the config */ + emit main_window->close(); + } + } + #ifdef DISCORD discord_load(); #endif @@ -279,20 +293,6 @@ main(int argc, char *argv[]) socket.connectToServer(qgetenv("86BOX_MANAGER_SOCKET")); } - /* Warn the user about unsupported configs */ - if (cpu_override) { - QMessageBox warningbox(QMessageBox::Icon::Warning, QObject::tr("You are loading an unsupported configuration"), - QObject::tr("CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."), - QMessageBox::NoButton, main_window); - warningbox.addButton(QObject::tr("Continue"), QMessageBox::AcceptRole); - warningbox.addButton(QObject::tr("Exit"), QMessageBox::RejectRole); - warningbox.exec(); - if (warningbox.result() == QDialog::Accepted) { - confirm_exit_cmdl = 0; /* skip the confirmation prompt without touching the config */ - emit main_window->close(); - } - } - // pc_reset_hard_init(); /* Set the PAUSE mode depending on the renderer. */ From 5ee5b858d3c6d076d2e12897f4515a2b5796340c Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 5 Nov 2023 02:10:39 +0100 Subject: [PATCH 4/4] Fixes to the cpu_override warning dialog handling per the suggestions by lemondrops. --- src/qt/qt_main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index d025c9168..845ff705f 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -212,14 +212,12 @@ main(int argc, char *argv[]) if (cpu_override) { QMessageBox warningbox(QMessageBox::Icon::Warning, QObject::tr("You are loading an unsupported configuration"), QObject::tr("CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."), - QMessageBox::NoButton, main_window); + QMessageBox::NoButton); warningbox.addButton(QObject::tr("Continue"), QMessageBox::AcceptRole); warningbox.addButton(QObject::tr("Exit"), QMessageBox::RejectRole); warningbox.exec(); - if (warningbox.result() == QDialog::Accepted) { - confirm_exit_cmdl = 0; /* skip the confirmation prompt without touching the config */ - emit main_window->close(); - } + if (warningbox.result() == QDialog::Accepted) + return 0; } #ifdef DISCORD