From f21d2db1a770b7c15c66d78c2943c9828f32d7e2 Mon Sep 17 00:00:00 2001 From: Nelson Kerber Hennemann Filho <87081197+nelsonhef@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:44:35 -0300 Subject: [PATCH 1/8] Minor change in pt-BR.po Better translation of string "None": Nada->Nenhum --- src/qt/languages/pt-BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index fa3fc94c1..f4e31f6aa 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -799,7 +799,7 @@ msgid "Thrustmaster Flight Control System" msgstr "Sistema de Controle de Voo Thrustmaster" msgid "None" -msgstr "Nada" +msgstr "Nenhum" msgid "%u MB (CHS: %i, %i, %i)" msgstr "%u MB (CCS: %i, %i, %i)" From 29adb860c81f67796cd96ee61c6a252d12ea9374 Mon Sep 17 00:00:00 2001 From: AstroMadson <98224233+AstroMadson@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:36:25 -0500 Subject: [PATCH 2/8] Renaming Gateway 2000 Tigereye 3V version to Mailman --- src/machine/m_at_socket7_3v.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c index c36fade86..40ae221a0 100644 --- a/src/machine/m_at_socket7_3v.c +++ b/src/machine/m_at_socket7_3v.c @@ -671,15 +671,15 @@ machine_at_p5vxb_init(const machine_t *model) } int -machine_at_gw2kte_init(const machine_t *model) +machine_at_gw2kma_init(const machine_t *model) { int ret; - ret = bios_load_linear_combined2("roms/machines/gw2kte/1008CY1T.BIO", - "roms/machines/gw2kte/1008CY1T.BI1", - "roms/machines/gw2kte/1008CY1T.BI2", - "roms/machines/gw2kte/1008CY1T.BI3", - "roms/machines/gw2kte/1008CY1T.RCV", + ret = bios_load_linear_combined2("roms/machines/gw2kma/1007DQ0T.BIO", + "roms/machines/gw2kma/1007DQ0T.BI1", + "roms/machines/gw2kma/1007DQ0T.BI2", + "roms/machines/gw2kma/1007DQ0T.BI3", + "roms/machines/gw2kma/1007DQ0T.RCV", 0x3a000, 128); if (bios_only || !ret) @@ -689,7 +689,6 @@ machine_at_gw2kte_init(const machine_t *model) pci_init(PCI_CONFIG_TYPE_1); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); - pci_register_slot(0x08, PCI_CARD_VIDEO, 4, 0, 0, 0); pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2); From ea3b987d9b7f866c867ac7993ee5706d5500c0ff Mon Sep 17 00:00:00 2001 From: AstroMadson <98224233+AstroMadson@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:38:39 -0500 Subject: [PATCH 3/8] Updated Gateway 2000 Tigereye to have Single and Dual Voltage versions --- src/include/86box/machine.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 5355fa0be..b109c7731 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -687,7 +687,7 @@ extern int machine_at_8500tuc_init(const machine_t *); extern int machine_at_p55t2s_init(const machine_t *); extern int machine_at_p5vxb_init(const machine_t *); -extern int machine_at_gw2kte_init(const machine_t *); +extern int machine_at_gw2kma_init(const machine_t *); extern int machine_at_ap5s_init(const machine_t *); extern int machine_at_pc140_6260_init(const machine_t *); @@ -722,6 +722,7 @@ extern int machine_at_pb680_init(const machine_t *); extern int machine_at_pb810_init(const machine_t *); extern int machine_at_mb520n_init(const machine_t *); extern int machine_at_i430vx_init(const machine_t *); +extern int machine_at_gw2kte_init(const machine_t *); extern int machine_at_ma23c_init(const machine_t *); extern int machine_at_nupro592_init(const machine_t *); From d95b6f4ec1538cbda0d34879c4b92a6cf354057b Mon Sep 17 00:00:00 2001 From: AstroMadson <98224233+AstroMadson@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:47:40 -0500 Subject: [PATCH 4/8] Added Renamed Tigereye to Hitman to add MMX support. --- src/machine/machine_table.c | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 5c8da9ee8..837d9a29f 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -11953,6 +11953,51 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, + +/* 430VX */ + /* Has a SM(S)C FDC37C932FR Super I/O chip with on-chip KBC with AMI + MegaKey (revision '5') KBC firmware. */ + { + .name = "[i430VX] Gateway 2000 Hitman", + .internal_name = "hitman", + .type = MACHINE_TYPE_SOCKET7, + .chipset = MACHINE_CHIPSET_INTEL_430VX, + .init = machine_at_hitman_init, + .p1_handler = NULL, + .gpio_handler = NULL, + .available_flag = MACHINE_AVAILABLE, + .gpio_acpi_handler = NULL, + .cpu = { + .package = CPU_PKG_SOCKET5_7, + .block = CPU_BLOCK_NONE, + .min_bus = 50000000, + .max_bus = 66666667, + .min_voltage = 2200, + .max_voltage = 3520, + .min_multi = 1.5, + .max_multi = 3.0 + }, + .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, + .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, + .ram = { + .min = 8192, + .max = 131072, + .step = 8192 + }, + .nvrmask = 511, + .kbc_device = NULL, + .kbc_p1 = 0xff, + .gpio = 0xffffffff, + .gpio_acpi = 0xffffffff, + .device = NULL, + .fdc_device = NULL, + .sio_device = NULL, + .vid_device = NULL, + .snd_device = NULL, + .net_device = NULL + }, + + /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix MultiKey/42 (version 1.38) KBC firmware. */ { From 39bc534dac4ed6e3c61eda0d3eee32f9d779ac48 Mon Sep 17 00:00:00 2001 From: AstroMadson <98224233+AstroMadson@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:48:51 -0500 Subject: [PATCH 5/8] renamed Tigereye to Hitman --- src/include/86box/machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index b109c7731..2312d2920 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -722,7 +722,7 @@ extern int machine_at_pb680_init(const machine_t *); extern int machine_at_pb810_init(const machine_t *); extern int machine_at_mb520n_init(const machine_t *); extern int machine_at_i430vx_init(const machine_t *); -extern int machine_at_gw2kte_init(const machine_t *); +extern int machine_at_hitman_init(const machine_t *); extern int machine_at_ma23c_init(const machine_t *); extern int machine_at_nupro592_init(const machine_t *); From 7250da349e67efccdf7c0e3960a50e1486b54788 Mon Sep 17 00:00:00 2001 From: AstroMadson <98224233+AstroMadson@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:52:21 -0500 Subject: [PATCH 6/8] Added the Hitman BIOS --- src/machine/m_at_socket7.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c index d7e2840a9..31afb0f01 100644 --- a/src/machine/m_at_socket7.c +++ b/src/machine/m_at_socket7.c @@ -824,6 +824,39 @@ machine_at_i430vx_init(const machine_t *model) return ret; } +int +machine_at_hitman_init(const machine_t *model) +{ + int ret; + + ret = bios_load_linear_combined2("roms/machines/hitman/1008CY1T.BIO", + "roms/machines/hitman/1008CY1T.BI1", + "roms/machines/hitman/1008CY1T.BI2", + "roms/machines/hitman/1008CY1T.BI3", + "roms/machines/hitman/1008CY1T.RCV", + 0x3a000, 128); + + if (bios_only || !ret) + return ret; + + machine_at_common_init_ex(model, 2); + + pci_init(PCI_CONFIG_TYPE_1); + pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); + pci_register_slot(0x08, PCI_CARD_VIDEO, 4, 0, 0, 0); + pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 3, 4, 1); + pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2); + pci_register_slot(0x10, PCI_CARD_NORMAL, 4, 1, 2, 3); + pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4); + device_add(&i430vx_device); + device_add(&piix3_device); + device_add(&fdc37c932fr_device); + device_add(&intel_flash_bxt_ami_device); + + return ret; +} + int machine_at_ma23c_init(const machine_t *model) { From a45ac121c6c042bdc741cc545c8403ec12449b4b Mon Sep 17 00:00:00 2001 From: AstroMadson <98224233+AstroMadson@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:42:35 -0500 Subject: [PATCH 7/8] Corrected the Machine Name to Pass Checks --- src/machine/machine_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 837d9a29f..59d1075bb 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -10933,11 +10933,11 @@ const machine_t machines[] = { /* Has a SM(S)C FDC37C932FR Super I/O chip with on-chip KBC with AMI MegaKey (revision '5') KBC firmware. */ { - .name = "[i430VX] Gateway 2000 Tigereye", - .internal_name = "gw2kte", + .name = "[i430VX] Gateway 2000 Mailman", + .internal_name = "gw2kma", .type = MACHINE_TYPE_SOCKET7_3V, .chipset = MACHINE_CHIPSET_INTEL_430VX, - .init = machine_at_gw2kte_init, + .init = machine_at_gw2kma_init, .p1_handler = NULL, .gpio_handler = NULL, .available_flag = MACHINE_AVAILABLE, From a72dfc71e641166b5e235f83e6f6ca8a13ca2582 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 12 Dec 2024 13:06:44 +0500 Subject: [PATCH 8/8] build.sh: Update the MacPorts OpenAL hack Fixes #5041 --- .ci/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index 5a829646a..326952186 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -542,11 +542,11 @@ then sudo sed -i -e 's/configure.env-append MAKE=/configure.env-append VULKAN_SDK=${prefix} MAKE=/g' "$qt5_portfile" fi - # Patch openal-soft to use 1.23.1 on all targets instead of 1.24.0 on >=11.0 only, + # Patch openal-soft to use 1.23.1 on all targets instead of 1.24.1 on >=10.15 only, # to prevent a symlink mismatch from having different versions on x86_64 and arm64. # See: https://github.com/macports/macports-ports/commit/9b4903fc9c76769d476079e404c9a3b8a225f8aa openal_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/audio/openal-soft/Portfile" - sudo sed -i -e 's/if {${os.platform} ne "darwin" || ${os.major} >= 21}/if {0}/g' "$openal_portfile" + sudo sed -i -e 's/if {${os.platform} ne "darwin" || ${os.major} >= 19}/if {0}/g' "$openal_portfile" # Patch wget to remove libproxy support, as it depends on shared-mime-info which # fails to build for a 10.13 target, which we have to do despite wget only being