Merge branch '86Box:master' into voodoo_test

CMakeLists.txt

@@ -40,7 +40,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 3.6
+    VERSION 3.7
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)

src/config.c

@@ -2767,7 +2767,7 @@ save_storage_controllers(void)
 
     delete_section_if_empty(cat);
 
-    if (cassette_enable == 1)
+    if (cassette_enable == 0)
         config_delete_var(cat, "cassette_enabled");
     else
         config_set_int(cat, "cassette_enabled", cassette_enable);

src/include_make/86box/version.h

@@ -20,11 +20,11 @@
 #define EMU_NAME	"86Box"
 #define EMU_NAME_W	LSTR(EMU_NAME)
 
-#define EMU_VERSION	"3.6"
+#define EMU_VERSION	"3.7"
 #define EMU_VERSION_W	LSTR(EMU_VERSION)
 #define EMU_VERSION_EX	"3.50" /* frozen due to IDE re-detection behavior on Windows */
 #define EMU_VERSION_MAJ	3
-#define EMU_VERSION_MIN	6
+#define EMU_VERSION_MIN	7
 #define EMU_VERSION_PATCH 0
 
 #define EMU_BUILD_NUM	0
@@ -40,7 +40,7 @@
 #define EMU_ROMS_URL	"https://github.com/86Box/roms/releases/latest"
 #define EMU_ROMS_URL_W	LSTR(EMU_ROMS_URL)
 #ifdef RELEASE_BUILD
-# define EMU_DOCS_URL	"https://86box.readthedocs.io/en/v3.6/"
+# define EMU_DOCS_URL	"https://86box.readthedocs.io/en/v3.7/"
 #else
 # define EMU_DOCS_URL	"https://86box.readthedocs.io"
 #endif

src/machine/machine_table.c

@@ -440,6 +440,40 @@ const machine_t machines[] = {
         .device = NULL,
         .vid_device = NULL
     },
+    {
+        .name = "[8088] Bondwell BW230",
+        .internal_name = "bw230",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_bw230_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 64,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL
+    },
     {
         .name = "[8088] Columbia Data Products MPC-1600",
         .internal_name = "mpc1600",
@@ -610,6 +644,108 @@ const machine_t machines[] = {
         .device = NULL,
         .vid_device = NULL
     },
+    {
+        .name = "[8088] Hyosung Topstar 88T",
+        .internal_name = "top88",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_top88_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 128,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL
+    },
+    {
+        .name = "[8088] Hyundai SUPER-16T",
+        .internal_name = "super16t",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_super16t_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 4772728,
+            .max_bus = 7159092,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 128,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL
+    },
+    {
+        .name = "[8088] Hyundai SUPER-16TE",
+        .internal_name = "super16te",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_super16te_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 10000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 128,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL
+    },
     {
         .name = "[8088] Juko ST",
         .internal_name = "jukopc",
@@ -916,6 +1052,40 @@ const machine_t machines[] = {
         .device = NULL,
         .vid_device = NULL
     },
+    {
+        .name = "[8088] Sanyo SX-16",
+        .internal_name = "sansx16",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_sansx16_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 256,
+            .max = 640,
+            .step = 256
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL
+    },
     {
         .name = "[8088] Schneider EuroPC",
         .internal_name = "europc",

src/qt/qt_mainwindow.cpp

@@ -1474,7 +1474,7 @@ void MainWindow::on_actionFullscreen_triggered() {
             questionbox.exec();
             config_save();
 
-            /* (re-capture mouse after dialog. */
+            /* (re-capture mouse after dialog). */
             if (wasCaptured)
                 emit setMouseCapture(true);
         }
@@ -1915,6 +1915,8 @@ void MainWindow::on_actionHiDPI_scaling_triggered()
 
 void MainWindow::on_actionHide_status_bar_triggered()
 {
+    auto w = ui->stackedWidget->width();
+    auto h = ui->stackedWidget->height();
     hide_status_bar ^= 1;
     ui->actionHide_status_bar->setChecked(hide_status_bar);
     statusBar()->setVisible(!hide_status_bar);
@@ -1926,13 +1928,16 @@ void MainWindow::on_actionHide_status_bar_triggered()
     } else {
         int vid_resize_orig = vid_resize;
         vid_resize = 0;
-        emit resizeContents(monitors[0].mon_scrnsz_x, monitors[0].mon_scrnsz_y);
+        emit resizeContents(w, h);
         vid_resize = vid_resize_orig;
+        if (vid_resize == 1) setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     }
 }
 
 void MainWindow::on_actionHide_tool_bar_triggered()
 {
+    auto w = ui->stackedWidget->width();
+    auto h = ui->stackedWidget->height();
     hide_tool_bar ^= 1;
     ui->actionHide_tool_bar->setChecked(hide_tool_bar);
     ui->toolBar->setVisible(!hide_tool_bar);
@@ -1944,8 +1949,9 @@ void MainWindow::on_actionHide_tool_bar_triggered()
     } else {
         int vid_resize_orig = vid_resize;
         vid_resize = 0;
-        emit resizeContents(monitors[0].mon_scrnsz_x, monitors[0].mon_scrnsz_y);
+        emit resizeContents(w, h);
         vid_resize = vid_resize_orig;
+        if (vid_resize == 1) setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     }
 }
 

src/qt/qt_settingsstoragecontrollers.cpp

@@ -161,6 +161,8 @@ void SettingsStorageControllers::onCurrentMachineChanged(int machineId) {
     int is_at = IS_AT(machineId);
     ui->checkBoxTertiaryIDE->setEnabled(is_at > 0);
     ui->checkBoxQuaternaryIDE->setEnabled(is_at > 0);
+    ui->checkBoxTertiaryIDE->setChecked(ui->checkBoxTertiaryIDE->isEnabled() && ide_ter_enabled);
+    ui->checkBoxQuaternaryIDE->setChecked(ui->checkBoxQuaternaryIDE->isEnabled() && ide_qua_enabled);
 }
 
 void SettingsStorageControllers::on_comboBoxHD_currentIndexChanged(int index) {

src/unix/assets/86Box.spec

@@ -12,10 +12,10 @@
 # After a successful build, you can install the RPMs as follows:
 #  sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
 
-%global romver 20220701
+%global romver 20220730
 
 Name:		86Box
-Version:	3.6
+Version:	3.7
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+
@@ -120,5 +120,5 @@ popd
 %{_bindir}/roms
 
 %changelog
-* Fri Jul 01 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.6-1
+* Sat Jul 30 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.7-1
 - Bump release

src/unix/assets/net.86box.86Box.metainfo.xml

@@ -10,7 +10,7 @@
     </categories>
     <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
     <releases>
-      <release version="3.6" date="2022-06-27"/>
+      <release version="3.7" date="2022-07-30"/>
     </releases>
     <content_rating type="oars-1.1" />
     <description>

src/video/vid_cl54xx.c

@@ -51,7 +51,8 @@
 #define BIOS_GD5428_ISA_PATH		"roms/video/cirruslogic/5428.bin"
 #define BIOS_GD5428_MCA_PATH		"roms/video/cirruslogic/SVGA141.ROM"
 #define BIOS_GD5428_PATH		"roms/video/cirruslogic/vlbusjapan.BIN"
-#define BIOS_GD5428_BOCA_ISA_PATH		"roms/video/cirruslogic/boca_gd5428_1.30b.bin"
+#define BIOS_GD5428_BOCA_ISA_PATH_1		"roms/video/cirruslogic/boca_gd5428_1.30b_1.bin"
+#define BIOS_GD5428_BOCA_ISA_PATH_2		"roms/video/cirruslogic/boca_gd5428_1.30b_2.bin"
 #define BIOS_GD5429_PATH		"roms/video/cirruslogic/5429.vbi"
 #define BIOS_GD5430_DIAMOND_A8_VLB_PATH	"roms/video/cirruslogic/diamondvlbus.bin"
 #define BIOS_GD5430_ORCHID_VLB_PATH	"roms/video/cirruslogic/orchidvlbus.bin"
@@ -3863,6 +3864,7 @@ static void
     int id = info->local & 0xff;
     int vram;
     char *romfn = NULL;
+    char *romfn1 = NULL, *romfn2 = NULL;
     memset(gd54xx, 0, sizeof(gd54xx_t));
 
     gd54xx->pci = !!(info->flags & DEVICE_PCI);
@@ -3917,8 +3919,10 @@ static void
 		if (info->local & 0x100)
 			if (gd54xx->vlb)
 				romfn = BIOS_GD5428_DIAMOND_B1_VLB_PATH;
-			else
+			else {
-				romfn = BIOS_GD5428_BOCA_ISA_PATH;
+                romfn1 = BIOS_GD5428_BOCA_ISA_PATH_1;
+				romfn2 = BIOS_GD5428_BOCA_ISA_PATH_2;
+			}
 		else {
 			if (gd54xx->vlb)
 				romfn = BIOS_GD5428_PATH;
@@ -4016,7 +4020,10 @@ static void
     gd54xx->vram_mask = gd54xx->vram_size - 1;
 
     if (romfn)
-	rom_init(&gd54xx->bios_rom, romfn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+        rom_init(&gd54xx->bios_rom, romfn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+    else if (romfn1 && romfn2)
+		rom_init_interleaved(&gd54xx->bios_rom, BIOS_GD5428_BOCA_ISA_PATH_1, BIOS_GD5428_BOCA_ISA_PATH_2, 0xc0000,
+				     0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
     if (info->flags & DEVICE_ISA)
 	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_isa);
@@ -4193,7 +4200,7 @@ gd5428_diamond_b1_available(void)
 static int
 gd5428_boca_isa_available(void)
 {
-    return rom_present(BIOS_GD5428_BOCA_ISA_PATH);
+    return rom_present(BIOS_GD5428_BOCA_ISA_PATH_1) && rom_present(BIOS_GD5428_BOCA_ISA_PATH_2);
 }
 
 static int

vcpkg.json

@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "3.6",
+    "version-string": "3.7",
     "homepage": "https://86box.net/",
     "documentation": "http://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",