diff --git a/README.md b/README.md
index ee0e1e7f1..506eba794 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@ Minimum system requirements and recommendations
* macOS version: macOS High Sierra 10.13 or newer
* 4 GB of RAM or higher
-Performance may vary depending on both host and guest configuration. Most emulation logic is executed in a single thread; therefore, systems with better IPC (instructions per clock) generally should be able to emulate higher clock speeds.
+Performance may vary depending on host and guest configuration. Most emulation logic is executed in a single thread. Therefore, systems with greater IPC (instructions per clock) capacity should be able to emulate higher clock speeds.
-It is also recommended to use a manager application with 86Box for easier handling of multiple virtual machines.
+For easier handling of multiple virtual machines, use a manager application:
* [Avalonia 86](https://github.com/notBald/Avalonia86) by [notBald](https://github.com/notBald) (Windows and Linux)
* [86Box Manager](https://github.com/86Box/86BoxManager) by [Overdoze](https://github.com/daviunic) (Windows only)
@@ -37,7 +37,7 @@ It is also recommended to use a manager application with 86Box for easier handli
* [Linbox-qt5](https://github.com/Dungeonseeker/linbox-qt5) by [Dungeonseeker](https://github.com/Dungeonseeker/) (Linux focused, should work on Windows though untested)
* [MacBox for 86Box](https://github.com/Moonif/MacBox) by [Moonif](https://github.com/Moonif) (MacOS only)
-It is also possible to use 86Box on its own with the `--vmpath`/`-P` command line option.
+To use 86Box on its own, use the `--vmpath`/`-P` command line option.
Getting started
---------------
@@ -47,7 +47,7 @@ See [our documentation](https://86box.readthedocs.io/en/latest/index.html) for a
Community
---------
-We operate an IRC channel and a Discord server for discussing 86Box, its development and anything related to retro computing. We look forward to hearing from you!
+We operate an IRC channel and a Discord server for discussing 86Box, its development, and anything related to retro computing. We look forward to hearing from you!
[](https://kiwiirc.com/client/irc.ringoflightning.net/?nick=86box|?#86Box)
diff --git a/src/86box.c b/src/86box.c
index aa802170d..59d47b440 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -168,7 +168,6 @@ int vid_api = 0; /* (C) video r
int vid_cga_contrast = 0; /* (C) video */
int video_fullscreen = 0; /* (C) video */
int video_fullscreen_scale = 0; /* (C) video */
-int video_fullscreen_first = 0; /* (C) video */
int enable_overscan = 0; /* (C) video */
int force_43 = 0; /* (C) video */
int video_filter_method = 1; /* (C) video */
@@ -1251,20 +1250,48 @@ pc_send_ca(uint16_t sc)
if (keyboard_mode >= 0x81) {
/* Use R-Alt because PS/55 DOS and OS/2 assign L-Alt Kanji */
keyboard_input(1, 0x1D); /* Ctrl key pressed */
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(1, 0x138); /* R-Alt key pressed */
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(1, sc);
+ if (keyboard_get_in_reset())
+ return;
usleep(50000);
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(0, sc);
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(0, 0x138); /* R-Alt key released */
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(0, 0x1D); /* Ctrl key released */
+ if (keyboard_get_in_reset())
+ return;
} else {
keyboard_input(1, 0x1D); /* Ctrl key pressed */
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(1, 0x38); /* Alt key pressed */
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(1, sc);
+ if (keyboard_get_in_reset())
+ return;
usleep(50000);
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(0, sc);
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(0, 0x38); /* Alt key released */
+ if (keyboard_get_in_reset())
+ return;
keyboard_input(0, 0x1D); /* Ctrl key released */
+ if (keyboard_get_in_reset())
+ return;
}
}
diff --git a/src/chipset/CMakeLists.txt b/src/chipset/CMakeLists.txt
index 6018dd045..94ef408f6 100644
--- a/src/chipset/CMakeLists.txt
+++ b/src/chipset/CMakeLists.txt
@@ -39,6 +39,7 @@ add_library(chipset OBJECT
intel_i450kx.c
intel_sio.c
intel_piix.c
+ isa486c.c
../ioapic.c
neat.c
opti283.c
diff --git a/src/chipset/isa486c.c b/src/chipset/isa486c.c
new file mode 100644
index 000000000..6494ed1b8
--- /dev/null
+++ b/src/chipset/isa486c.c
@@ -0,0 +1,131 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/plat_unused.h>
+#include <86box/chipset.h>
+
+typedef struct isa486c_t {
+ uint8_t regs[3];
+} isa486c_t;
+
+static void
+isa486c_recalcmapping(isa486c_t *dev)
+{
+ uint32_t shflags = 0;
+ uint32_t bases[5] = { 0x000c0000, 0x000c8000, 0x000d0000, 0x000d8000, 0x000e0000 };
+ uint32_t sizes[5] = { 0x00008000, 0x00008000, 0x00008000, 0x00008000, 0x00020000 };
+
+ if (dev->regs[1] & 0x20)
+ shflags = MEM_READ_EXTANY | MEM_WRITE_INTERNAL;
+ else
+ shflags = MEM_READ_INTERNAL | MEM_WRITE_EXTANY;
+
+ shadowbios = 0;
+ shadowbios_write = 0;
+
+ for (uint8_t i = 0; i < 5; i++)
+ if (dev->regs[1] & (1 << i)) {
+ if (i == 4) {
+ shadowbios = 1;
+ shadowbios_write = !!(dev->regs[1] & 0x20);
+ }
+
+ mem_set_mem_state_both(bases[i], sizes[i], shflags);
+ } else
+ mem_set_mem_state_both(bases[i], sizes[i], MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+ flushmmucache_nopc();
+}
+
+static void
+isa486c_write(uint16_t addr, uint8_t val, void *priv)
+{
+ isa486c_t *dev = (isa486c_t *) priv;
+
+ switch (addr) {
+ case 0x0023:
+ dev->regs[0] = val;
+ break;
+ /*
+ Port 25h:
+ - Bit 0 = Video BIOS (C000-C7FF) shadow enabled;
+ - Bit 1 = C800-C8FF shadow enabled;
+ - Bit 2 = D000-D7FF shadow enabled;
+ - Bit 3 = D800-DFFF shadow enabled;
+ - Bit 4 = E000-FFFF shadow enabled (or F0000-FFFFF?);
+ - Bit 5 = If set, read from ROM, write to shadow;
+ - Bit 6 = KEN Video & BIOS enabled (cacheability!).
+ */
+ case 0x0025:
+ dev->regs[1] = val;
+ isa486c_recalcmapping(dev);
+ break;
+ case 0x0027:
+ dev->regs[2] = val;
+ break;
+ }
+}
+
+static uint8_t
+isa486c_read(uint16_t addr, void *priv)
+{
+ isa486c_t *dev = (isa486c_t *) priv;
+ uint8_t ret = 0xff;
+
+ switch (addr) {
+ case 0x0023:
+ ret = dev->regs[0];
+ break;
+ case 0x0025:
+ ret = dev->regs[1];
+ break;
+ case 0x0027:
+ ret = dev->regs[2];
+ break;
+ }
+
+ return ret;
+}
+
+static void
+isa486c_close(void *priv)
+{
+ isa486c_t *dev = (isa486c_t *) priv;
+
+ free(dev);
+}
+
+static void *
+isa486c_init(UNUSED(const device_t *info))
+{
+ isa486c_t *dev = (isa486c_t *) calloc(1, sizeof(isa486c_t));
+
+ io_sethandler(0x0023, 0x0001, isa486c_read, NULL, NULL, isa486c_write, NULL, NULL, dev);
+ io_sethandler(0x0025, 0x0001, isa486c_read, NULL, NULL, isa486c_write, NULL, NULL, dev);
+ io_sethandler(0x0027, 0x0001, isa486c_read, NULL, NULL, isa486c_write, NULL, NULL, dev);
+
+ return dev;
+}
+
+const device_t isa486c_device = {
+ .name = "ASUS ISA-486C Gate Array",
+ .internal_name = "isa486c",
+ .flags = 0,
+ .local = 0,
+ .init = isa486c_init,
+ .close = isa486c_close,
+ .reset = NULL,
+ .available = NULL,
+ .speed_changed = NULL,
+ .force_redraw = NULL,
+ .config = NULL
+};
diff --git a/src/codegen_new/codegen_backend_x86-64_ops.c b/src/codegen_new/codegen_backend_x86-64_ops.c
index fc6c1b492..ed218d7c4 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops.c
@@ -780,8 +780,18 @@ host_x86_MOV32_REG_ABS(codeblock_t *block, int dst_reg, void *p)
codegen_alloc_bytes(block, 8);
codegen_addbyte4(block, 0x41, 0x8b, 0x84 | ((dst_reg & 7) << 3), 0x24); /*MOV dst_reg, ram_offset[R12]*/
codegen_addlong(block, ram_offset);
+ } else if ((ram_offset < -2147483648LL) || (ram_offset > 2147483647LL) || !(block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+ // fatal("host_x86_MOV32_REG_ABS - out of range\n");
+ // void *q = p;
+ //uint32_t *r = NULL;
+ // *r = 5; /* Crash deliberately. */
+ codegen_alloc_bytes(block, 8);
+ codegen_addbyte2(block, 0x49, 0xb9); /*MOV r9,(uintptr_t) p*/
+ codegen_addquad(block, (uintptr_t) p);
+ codegen_alloc_bytes(block, 3);
+ codegen_addbyte3(block, 0x41, 0x8b, 0x01 | ((dst_reg & 7) << 3)); /*MOV dst_reg, [R9]*/
} else {
- fatal("host_x86_MOV32_REG_ABS - out of range\n");
+ fatal("host_x86_MOV32_REG_ABS - RAM offset = %016" PRIX64 " (p - ram = %016" PRIX64 ")\n", ram_offset, (uintptr_t) p - (uintptr_t) ram);
codegen_alloc_bytes(block, 6);
codegen_addbyte(block, 0x8b); /*MOV [p], src_reg*/
codegen_addbyte(block, 0x05 | ((dst_reg & 7) << 3));
diff --git a/src/config.c b/src/config.c
index 52a80763a..dfe0190ac 100644
--- a/src/config.c
+++ b/src/config.c
@@ -128,8 +128,6 @@ load_general(void)
video_fullscreen_scale = ini_section_get_int(cat, "video_fullscreen_scale", 1);
- video_fullscreen_first = ini_section_get_int(cat, "video_fullscreen_first", 1);
-
video_filter_method = ini_section_get_int(cat, "video_filter_method", 1);
inhibit_multimedia_keys = ini_section_get_int(cat, "inhibit_multimedia_keys", 0);
@@ -1832,7 +1830,6 @@ config_load(void)
gfxcard[0] = video_get_video_from_internal_name("cga");
vid_api = plat_vidapi("default");
vid_resize = 0;
- video_fullscreen_first = 1;
video_fullscreen_scale = 1;
time_sync = TIME_SYNC_ENABLED;
hdc_current[0] = hdc_get_from_internal_name("none");
@@ -1955,11 +1952,6 @@ save_general(void)
else
ini_section_set_int(cat, "video_fullscreen_scale", video_fullscreen_scale);
- if (video_fullscreen_first == 1)
- ini_section_delete_var(cat, "video_fullscreen_first");
- else
- ini_section_set_int(cat, "video_fullscreen_first", video_fullscreen_first);
-
if (video_filter_method == 1)
ini_section_delete_var(cat, "video_filter_method");
else
diff --git a/src/device.c b/src/device.c
index 25f0b55de..1922806b9 100644
--- a/src/device.c
+++ b/src/device.c
@@ -390,42 +390,18 @@ device_get_priv(const device_t *dev)
int
device_available(const device_t *dev)
{
- if (dev != NULL) {
- const device_config_t *config = dev->config;
- if (config != NULL) {
- while (config->type != CONFIG_END) {
- if (config->type == CONFIG_BIOS) {
- int roms_present = 0;
- const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
-
- /* Go through the ROM's in the device configuration. */
- while ((bios != NULL) &&
- (bios->name != NULL) &&
- (bios->internal_name != NULL) &&
- (bios->files_no != 0)) {
- int i = 0;
- for (uint8_t bf = 0; bf < bios->files_no; bf++)
- i += !!rom_present(bios->files[bf]);
- if (i == bios->files_no)
- roms_present++;
- bios++;
- }
-
- return (roms_present ? -1 : 0);
- }
- config++;
- }
- }
+ int ret = machine_device_available(dev);
+ if (ret == 0) {
/* No CONFIG_BIOS field present, use the classic available(). */
if (dev->available != NULL)
- return (dev->available());
+ ret = (dev->available());
else
- return 1;
- }
+ ret = (dev != NULL);
+ } else
+ ret = (ret == -1);
- /* A NULL device is never available. */
- return 0;
+ return ret;
}
uint8_t
@@ -969,6 +945,36 @@ machine_get_config_string(char *str)
return ret;
}
+int
+machine_device_available(const device_t *dev)
+{
+ if (dev != NULL) {
+ const device_config_t *config = dev->config;
+ if ((config != NULL) && (config->type == CONFIG_BIOS)) {
+ int roms_present = 0;
+ const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
+
+ /* Go through the ROM's in the device configuration. */
+ while ((bios != NULL) &&
+ (bios->name != NULL) &&
+ (bios->internal_name != NULL) &&
+ (bios->files_no != 0)) {
+ int i = 0;
+ for (uint8_t bf = 0; bf < bios->files_no; bf++)
+ i += !!rom_present(bios->files[bf]);
+ if (i == bios->files_no)
+ roms_present++;
+ bios++;
+ }
+
+ return (roms_present ? -1 : -2);
+ }
+ }
+
+ /* NULL device or no CONFIG_BIOS field, return 0. */
+ return 0;
+}
+
const device_t *
device_context_get_device(void)
{
diff --git a/src/device/keyboard.c b/src/device/keyboard.c
index 800e7fb8e..16904fe3b 100644
--- a/src/device/keyboard.c
+++ b/src/device/keyboard.c
@@ -64,11 +64,12 @@ static int keydelay[512];
#endif
static scancode *scan_table; /* scancode table for keyboard */
-static volatile uint8_t caps_lock = 0;
-static volatile uint8_t num_lock = 0;
-static volatile uint8_t scroll_lock = 0;
-static volatile uint8_t kana_lock = 0;
-static uint8_t shift = 0;
+static volatile uint8_t caps_lock = 0;
+static volatile uint8_t num_lock = 0;
+static volatile uint8_t scroll_lock = 0;
+static volatile uint8_t kana_lock = 0;
+static volatile uint8_t kbd_in_reset = 0;
+static uint8_t shift = 0;
static int key5576mode = 0;
@@ -106,11 +107,12 @@ static scconvtbl scconv55_8a[18 + 1] =
void
keyboard_init(void)
{
- num_lock = 0;
- caps_lock = 0;
- scroll_lock = 0;
- kana_lock = 0;
- shift = 0;
+ num_lock = 0;
+ caps_lock = 0;
+ scroll_lock = 0;
+ kana_lock = 0;
+ shift = 0;
+ kbd_in_reset = 0;
memset(recv_key, 0x00, sizeof(recv_key));
memset(recv_key_ui, 0x00, sizeof(recv_key));
@@ -238,6 +240,9 @@ key_process(uint16_t scan, int down)
void
keyboard_input(int down, uint16_t scan)
{
+ if (kbd_in_reset)
+ return;
+
/* Special case for E1 1D, translate it to 0100 - special case. */
if ((scan >> 8) == 0xe1) {
if ((scan & 0xff) == 0x1d)
@@ -343,9 +348,9 @@ void
keyboard_all_up(void)
{
for (unsigned short i = 0; i < 0x200; i++) {
- if (recv_key_ui[i]) {
+ if (recv_key_ui[i])
recv_key_ui[i] = 0;
- }
+
if (recv_key[i]) {
recv_key[i] = 0;
key_process(i, 0);
@@ -353,6 +358,18 @@ keyboard_all_up(void)
}
}
+void
+keyboard_set_in_reset(uint8_t in_reset)
+{
+ kbd_in_reset = in_reset;
+}
+
+uint8_t
+keyboard_get_in_reset(void)
+{
+ return kbd_in_reset;
+}
+
static uint8_t
keyboard_do_break(uint16_t scan)
{
diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c
index fbf167e3f..4b1097df4 100644
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -3476,7 +3476,10 @@ keyboard_at_bat(void *priv)
keyboard_scan = 1;
+ keyboard_all_up();
keyboard_update_states(0, 0, 0, 0);
+
+ keyboard_set_in_reset(0);
kbc_at_dev_queue_add(dev, 0xaa, 0);
} else {
bat_counter--;
@@ -3714,6 +3717,7 @@ keyboard_at_write(void *priv)
break;
case 0xff: /* reset */
+ keyboard_set_in_reset(1);
kbc_at_dev_reset(dev, 1);
bat_counter = 1000;
break;
diff --git a/src/device/postcard.c b/src/device/postcard.c
index 9e2c629c1..b91d8b402 100644
--- a/src/device/postcard.c
+++ b/src/device/postcard.c
@@ -158,6 +158,8 @@ postcard_init(UNUSED(const device_t *info))
postcard_port = 0x84; /* ISA Compaq machines */
else if (strstr(machines[machine].name, "Olivetti"))
postcard_port = 0x378; /* Olivetti machines */
+ else if (!strcmp(machines[machine].internal_name, "isa486c"))
+ postcard_port = 0x5080; /* ASUS ISA-486C */
else
postcard_port = 0x80; /* AT and clone machines */
postcard_log("POST card initializing on port %04Xh\n", postcard_port);
diff --git a/src/disk/hdc_ide_rz1000.c b/src/disk/hdc_ide_rz1000.c
index d93e83859..2c1a09e8e 100644
--- a/src/disk/hdc_ide_rz1000.c
+++ b/src/disk/hdc_ide_rz1000.c
@@ -55,7 +55,6 @@ typedef struct rz1000_t {
static int next_id = 0;
-#define ENABLE_RZ1000_LOG 1
#ifdef ENABLE_RZ1000_LOG
int rz1000_do_log = ENABLE_RZ1000_LOG;
diff --git a/src/disk/hdc_xta.c b/src/disk/hdc_xta.c
index 85581af2d..d54f6ab0c 100644
--- a/src/disk/hdc_xta.c
+++ b/src/disk/hdc_xta.c
@@ -1106,6 +1106,36 @@ xta_close(void *priv)
static const device_config_t wdxt150_config[] = {
// clang-format off
+ {
+ .name = "bios_rev",
+ .description = "BIOS Revision",
+ .type = CONFIG_BIOS,
+ .default_string = "rev_1",
+ .default_int = 0,
+ .file_filter = NULL,
+ .spinner = { 0 },
+ .bios = {
+ {
+ .name = "Revision 1.0",
+ .internal_name = "rev_1",
+ .bios_type = BIOS_NORMAL,
+ .files_no = 1,
+ .local = 0,
+ .size = 8192,
+ .files = { WD_REV_1_BIOS_FILE, "" }
+ },
+ {
+ .name = "Revision 2.0",
+ .internal_name = "rev_2",
+ .bios_type = BIOS_NORMAL,
+ .files_no = 1,
+ .local = 0,
+ .size = 8192,
+ .files = { WD_REV_2_BIOS_FILE, "" }
+ },
+ { .files_no = 0 }
+ },
+ },
{
.name = "base",
.description = "Address",
@@ -1151,36 +1181,6 @@ static const device_config_t wdxt150_config[] = {
},
.bios = { { 0 } }
},
- {
- .name = "bios_rev",
- .description = "BIOS Revision",
- .type = CONFIG_BIOS,
- .default_string = "rev_1",
- .default_int = 0,
- .file_filter = NULL,
- .spinner = { 0 },
- .bios = {
- {
- .name = "Revision 1.0",
- .internal_name = "rev_1",
- .bios_type = BIOS_NORMAL,
- .files_no = 1,
- .local = 0,
- .size = 8192,
- .files = { WD_REV_1_BIOS_FILE, "" }
- },
- {
- .name = "Revision 2.0",
- .internal_name = "rev_2",
- .bios_type = BIOS_NORMAL,
- .files_no = 1,
- .local = 0,
- .size = 8192,
- .files = { WD_REV_2_BIOS_FILE, "" }
- },
- { .files_no = 0 }
- },
- },
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format off
};
diff --git a/src/disk/hdc_xtide.c b/src/disk/hdc_xtide.c
index 154a28cec..1c8e2c8da 100644
--- a/src/disk/hdc_xtide.c
+++ b/src/disk/hdc_xtide.c
@@ -252,6 +252,37 @@ xtide_at_close(void *priv)
// clang-format off
static const device_config_t xtide_config[] = {
+ {
+ .name = "bios",
+ .description = "BIOS Revision",
+ .type = CONFIG_BIOS,
+ .default_string = "xt",
+ .default_int = 0,
+ .file_filter = NULL,
+ .spinner = { 0 },
+ .selection = { { 0 } },
+ .bios = {
+ {
+ .name = "Regular XT",
+ .internal_name = "xt",
+ .bios_type = BIOS_NORMAL,
+ .files_no = 1,
+ .local = 0,
+ .size = 8192,
+ .files = { ROM_PATH_XT, "" }
+ },
+ {
+ .name = "XT+ (V20/V30/8018x)",
+ .internal_name = "xt_plus",
+ .bios_type = BIOS_NORMAL,
+ .files_no = 1,
+ .local = 0,
+ .size = 8192,
+ .files = { ROM_PATH_XTP, "" }
+ },
+ { .files_no = 0 }
+ },
+ },
{
.name = "base",
.description = "Address",
@@ -348,37 +379,6 @@ static const device_config_t xtide_config[] = {
},
.bios = { { 0 } }
},
- {
- .name = "bios",
- .description = "BIOS Revision",
- .type = CONFIG_BIOS,
- .default_string = "xt",
- .default_int = 0,
- .file_filter = NULL,
- .spinner = { 0 },
- .selection = { { 0 } },
- .bios = {
- {
- .name = "Regular XT",
- .internal_name = "xt",
- .bios_type = BIOS_NORMAL,
- .files_no = 1,
- .local = 0,
- .size = 8192,
- .files = { ROM_PATH_XT, "" }
- },
- {
- .name = "XT+ (V20/V30/8018x)",
- .internal_name = "xt_plus",
- .bios_type = BIOS_NORMAL,
- .files_no = 1,
- .local = 0,
- .size = 8192,
- .files = { ROM_PATH_XTP, "" }
- },
- { .files_no = 0 }
- },
- },
{ .name = "", .description = "", .type = CONFIG_END }
};
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index de8508e69..e779ea2d7 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -279,6 +279,15 @@ fdc_is_mfm(fdc_t *fdc)
return fdc->mfm ? 1 : 0;
}
+int
+fdc_is_dma(fdc_t *fdc)
+{
+ if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->dma)
+ return 0;
+ else
+ return 1;
+}
+
void
fdc_request_next_sector_id(fdc_t *fdc)
{
diff --git a/src/floppy/fdd_86f.c b/src/floppy/fdd_86f.c
index 0a7120b16..24fde57b1 100644
--- a/src/floppy/fdd_86f.c
+++ b/src/floppy/fdd_86f.c
@@ -2414,16 +2414,28 @@ d86f_turbo_poll(int drive, int side)
case STATE_0C_READ_DATA:
case STATE_11_SCAN_DATA:
case STATE_16_VERIFY_DATA:
- d86f_turbo_read(drive, side);
+ if (fdc_is_dma(d86f_fdc))
+ for (int i = 0; i < (128 << dev->last_sector.id.n); i++)
+ d86f_turbo_read(drive, side);
+ else
+ d86f_turbo_read(drive, side);
break;
case STATE_05_WRITE_DATA:
case STATE_09_WRITE_DATA:
- d86f_turbo_write(drive, side);
+ if (fdc_is_dma(d86f_fdc))
+ for (int i = 0; i < (128 << dev->last_sector.id.n); i++)
+ d86f_turbo_write(drive, side);
+ else
+ d86f_turbo_write(drive, side);
break;
case STATE_0D_FORMAT_TRACK:
- d86f_turbo_format(drive, side, (side && (d86f_get_sides(drive) != 2)));
+ if (fdc_is_dma(d86f_fdc))
+ while (dev->state == STATE_0D_FORMAT_TRACK)
+ d86f_turbo_format(drive, side, (side && (d86f_get_sides(drive) != 2)));
+ else
+ d86f_turbo_format(drive, side, (side && (d86f_get_sides(drive) != 2)));
return;
case STATE_IDLE:
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index e19665535..76f311d17 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -121,7 +121,6 @@ extern int dpi_scale; /* (C) DPI scaling of the emulated s
extern int vid_api; /* (C) video renderer */
extern int vid_cga_contrast; /* (C) video */
extern int video_fullscreen; /* (C) video */
-extern int video_fullscreen_first; /* (C) video */
extern int video_fullscreen_scale; /* (C) video */
extern int enable_overscan; /* (C) video */
extern int force_43; /* (C) video */
diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h
index 3a65bbce9..fe088b209 100644
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -37,6 +37,9 @@ extern const device_t ali6117d_device;
/* AMD */
extern const device_t amd640_device;
+/* ASUS */
+extern const device_t isa486c_device;
+
/* Compaq */
extern const device_t compaq_386_device;
extern const device_t compaq_genoa_device;
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index 91ff2daa6..76f12a0c5 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -239,6 +239,8 @@ extern const char *device_get_internal_name(const device_t *dev);
extern int machine_get_config_int(char *str);
extern const char *machine_get_config_string(char *str);
+extern int machine_device_available(const device_t *dev);
+
extern const device_t device_none;
extern const device_t device_internal;
diff --git a/src/include/86box/fdc.h b/src/include/86box/fdc.h
index 36cfaeb7a..ed62cb45f 100644
--- a/src/include/86box/fdc.h
+++ b/src/include/86box/fdc.h
@@ -206,6 +206,7 @@ extern int fdc_get_drive(fdc_t *fdc);
extern int fdc_get_perp(fdc_t *fdc);
extern int fdc_get_format_n(fdc_t *fdc);
extern int fdc_is_mfm(fdc_t *fdc);
+extern int fdc_is_dma(fdc_t *fdc);
extern double fdc_get_hut(fdc_t *fdc);
extern double fdc_get_hlt(fdc_t *fdc);
extern void fdc_request_next_sector_id(fdc_t *fdc);
diff --git a/src/include/86box/keyboard.h b/src/include/86box/keyboard.h
index f62896106..dd8cae54b 100644
--- a/src/include/86box/keyboard.h
+++ b/src/include/86box/keyboard.h
@@ -273,6 +273,8 @@ extern void keyboard_input(int down, uint16_t scan);
extern void keyboard_all_up(void);
extern void keyboard_update_states(uint8_t cl, uint8_t nl, uint8_t sl, uint8_t kl);
extern uint8_t keyboard_get_shift(void);
+extern void keyboard_set_in_reset(uint8_t in_reset);
+extern uint8_t keyboard_get_in_reset(void);
extern void keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl, uint8_t *kl);
extern void keyboard_set_states(uint8_t cl, uint8_t nl, uint8_t sl);
extern int keyboard_recv(uint16_t key);
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index d8c213d53..c28add516 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -508,11 +508,13 @@ extern int machine_at_pc916sx_init(const machine_t *);
sure this appear here (and in the .c file) in the order and position
in which they appear in the machine table. */
extern int machine_at_dataexpert386wb_init(const machine_t *);
+extern int machine_at_isa486c_init(const machine_t *);
extern int machine_at_genoa486_init(const machine_t *);
extern int machine_at_ga486l_init(const machine_t *);
extern int machine_at_cougar_init(const machine_t *);
extern int machine_at_acc386_init(const machine_t *);
+extern int machine_at_asus386_3364k_init(const machine_t *);
extern int machine_at_asus386_init(const machine_t *);
extern int machine_at_ecs386_init(const machine_t *);
extern int machine_at_spc6000a_init(const machine_t *);
diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index bbc673dcf..e6a366f4c 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -32,8 +32,8 @@
/* String ID numbers. */
enum {
STRING_MOUSE_CAPTURE, /* "Click to capture mouse" */
- STRING_MOUSE_RELEASE, /* "Press F8+F12 to release mouse" */
- STRING_MOUSE_RELEASE_MMB, /* "Press F8+F12 or middle button to release mouse" */
+ STRING_MOUSE_RELEASE, /* "Press %1 to release mouse" */
+ STRING_MOUSE_RELEASE_MMB, /* "Press %1 or middle button to release mouse" */
STRING_INVALID_CONFIG, /* "Invalid configuration" */
STRING_NO_ST506_ESDI_CDROM, /* "MFM/RLL or ESDI CD-ROM drives never existed" */
STRING_NET_ERROR, /* "Failed to initialize network driver" */
diff --git a/src/include/86box/video.h b/src/include/86box/video.h
index 6c7f93dd5..673ddffa0 100644
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -189,7 +189,6 @@ extern uint32_t pal_lookup[256];
#endif
extern int video_fullscreen;
extern int video_fullscreen_scale;
-extern int video_fullscreen_first;
extern uint8_t fontdat[2048][8];
extern uint8_t fontdatm[2048][16];
extern uint8_t fontdat2[2048][8];
@@ -488,6 +487,7 @@ extern const device_t s3_metheus_86c928_isa_device;
extern const device_t s3_metheus_86c928_vlb_device;
extern const device_t s3_spea_mercury_lite_86c928_pci_device;
extern const device_t s3_spea_mirage_86c801_isa_device;
+extern const device_t s3_winner1000_805_isa_device;
extern const device_t s3_86c805_onboard_vlb_device;
extern const device_t s3_spea_mirage_86c805_vlb_device;
extern const device_t s3_mirocrystal_8s_805_vlb_device;
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index ed8f75a84..e75c5414e 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -72,6 +72,27 @@ machine_at_acc386_init(const machine_t *model)
return ret;
}
+int
+machine_at_asus386_3364k_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_linear("roms/machines/asus386_3364k/am27c512dip28-64b53c26be3d8160533563.bin",
+ 0x000f0000, 65536, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_init(model);
+ device_add(&rabbit_device);
+ device_add(&keyboard_at_ami_device);
+
+ if (fdc_current[0] == FDC_INTERNAL)
+ device_add(&fdc_at_device);
+
+ return ret;
+}
+
int
machine_at_asus386_init(const machine_t *model)
{
@@ -2445,6 +2466,30 @@ machine_at_dataexpert386wb_init(const machine_t *model)
return ret;
}
+int
+machine_at_isa486c_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_linear("roms/machines/isa486c/asus-isa-486c-401a0-040591-657e2c17a0218417632602.bin",
+ 0x000f0000, 65536, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_init(model);
+
+ device_add(&isa486c_device);
+ device_add(&port_92_key_device);
+
+ device_add(&keyboard_at_ami_device);
+
+ if (fdc_current[0] == FDC_INTERNAL)
+ device_add(&fdc_at_device);
+
+ return ret;
+}
+
int
machine_at_genoa486_init(const machine_t *model)
{
diff --git a/src/machine/m_at_socket4.c b/src/machine/m_at_socket4.c
index 92f88fbe6..88474d431 100644
--- a/src/machine/m_at_socket4.c
+++ b/src/machine/m_at_socket4.c
@@ -219,7 +219,22 @@ machine_at_ambradp60_init(const machine_t *model)
if (bios_only || !ret)
return ret;
- machine_at_premiere_common_init(model, 0);
+ machine_at_common_init_ex(model, 2);
+
+ device_add(&amstrad_megapc_nvr_device);
+ device_add(&ide_pci_device);
+
+ pci_init(PCI_CONFIG_TYPE_2);
+ pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+ pci_register_slot(0x01, PCI_CARD_IDE, 0, 0, 0, 0);
+ pci_register_slot(0x06, PCI_CARD_NORMAL, 3, 2, 1, 4);
+ pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
+ pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
+ pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+ device_add(&keyboard_ps2_phoenix_device);
+ device_add(&sio_zb_device);
+ device_add(&fdc37c665_ide_pri_device);
+ device_add(&intel_flash_bxt_ami_device);
device_add(&i430lx_device);
@@ -239,7 +254,7 @@ machine_at_valuepointp60_init(const machine_t *model)
return ret;
machine_at_common_init(model);
- device_add(&ide_pci_2ch_device);
+ device_add(&ide_pci_device);
pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -251,6 +266,7 @@ machine_at_valuepointp60_init(const machine_t *model)
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&keyboard_ps2_ps1_pci_device);
device_add(&sio_device);
+ device_add(&ide_rz1000_pci_single_channel_device);
device_add(&fdc37c665_device);
device_add(&intel_flash_bxt_ami_device);
diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index 0d748b85e..4b3bbd49c 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -110,19 +110,19 @@ machine_at_p54np4_init(const machine_t *model)
return ret;
machine_at_common_init(model);
+ device_add(&ide_vlb_2ch_device);
- pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+ pci_init(PCI_CONFIG_TYPE_2 | PCI_CAN_SWITCH_TYPE);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
- pci_register_slot(0x03, PCI_CARD_NORMAL, 1, 2, 3, 4); /* 03 = Slot 1 */
- pci_register_slot(0x04, PCI_CARD_NORMAL, 2, 3, 4, 1); /* 04 = Slot 2 */
- pci_register_slot(0x05, PCI_CARD_NORMAL, 3, 4, 1, 2); /* 05 = Slot 3 */
- pci_register_slot(0x06, PCI_CARD_NORMAL, 4, 1, 2, 3); /* 06 = Slot 4 */
- pci_register_slot(0x07, PCI_CARD_SCSI, 1, 2, 3, 4); /* 07 = SCSI */
+ pci_register_slot(0x06, PCI_CARD_NORMAL, 1, 2, 3, 4); /* 06 = Slot 1 */
+ pci_register_slot(0x05, PCI_CARD_NORMAL, 2, 3, 4, 1); /* 05 = Slot 2 */
+ pci_register_slot(0x04, PCI_CARD_NORMAL, 3, 4, 1, 2); /* 04 = Slot 3 */
+ pci_register_slot(0x03, PCI_CARD_NORMAL, 4, 1, 2, 3); /* 03 = Slot 4 */
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430nx_device);
+ device_add(&sio_zb_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&fdc37c665_ide_pri_device);
- device_add(&ncr53c810_onboard_pci_device);
device_add(&intel_flash_bxt_device);
return ret;
diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c
index 913c82518..39dc2d735 100644
--- a/src/machine/m_at_socket7_3v.c
+++ b/src/machine/m_at_socket7_3v.c
@@ -825,13 +825,58 @@ machine_at_vectra54_init(const machine_t *model)
return ret;
}
+static const device_config_t c5sbm2_config[] = {
+ // clang-format off
+ {
+ .name = "bios",
+ .description = "BIOS Version",
+ .type = CONFIG_BIOS,
+ .default_string = "5sbm2",
+ .default_int = 0,
+ .file_filter = "",
+ .spinner = { 0 },
+ .bios = {
+ { .name = "4.50GP (07/17/1995)", .internal_name = "5sbm2", .bios_type = BIOS_NORMAL,
+ .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0717.BIN", "" } },
+ { .name = "4.50PG (03/21/1996)", .internal_name = "5sbm2_450pg", .bios_type = BIOS_NORMAL,
+ .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0326.BIN", "" } },
+ { .name = "4.51PG (03/15/2000 Unicore Upgrade)", .internal_name = "5sbm2_451pg", .bios_type = BIOS_NORMAL,
+ .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/2A5ICC3A.BIN", "" } },
+ { .files_no = 0 }
+ },
+ },
+ { .name = "", .description = "", .type = CONFIG_END }
+ // clang-format on
+};
+
+const device_t c5sbm2_device = {
+ .name = "Chaintech 5SBM/5SBM2 (M103)",
+ .internal_name = "5sbm2_device",
+ .flags = 0,
+ .local = 0,
+ .init = NULL,
+ .close = NULL,
+ .reset = NULL,
+ .available = NULL,
+ .speed_changed = NULL,
+ .force_redraw = NULL,
+ .config = c5sbm2_config
+};
+
int
machine_at_5sbm2_init(const machine_t *model)
{
- int ret;
+ int ret = 0;
+ const char* fn;
- ret = bios_load_linear("roms/machines/5sbm2/5SBM0717.BIN",
- 0x000e0000, 131072, 0);
+ /* No ROMs available */
+ if (!device_available(model->device))
+ return ret;
+
+ device_context(model->device);
+ fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+ ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+ device_context_restore();
if (bios_only || !ret)
return ret;
diff --git a/src/machine/m_xt_laserxt.c b/src/machine/m_xt_laserxt.c
index d298e726b..7a6cab5e3 100644
--- a/src/machine/m_xt_laserxt.c
+++ b/src/machine/m_xt_laserxt.c
@@ -154,6 +154,14 @@ lxt_ems_write(uint32_t addr, uint8_t val, void *priv)
mem[addr & 0x3fff] = val;
}
+static void
+lxt_ems_writew(uint32_t addr, uint16_t val, void *priv)
+{
+ uint8_t *mem = (uint8_t *) priv;
+
+ *(uint16_t *) &(mem[addr & 0x3fff]) = val;
+}
+
static uint8_t
lxt_ems_read(uint32_t addr, void *priv)
{
@@ -165,6 +173,17 @@ lxt_ems_read(uint32_t addr, void *priv)
return ret;
}
+static uint16_t
+lxt_ems_readw(uint32_t addr, void *priv)
+{
+ uint8_t *mem = (uint8_t *) priv;
+ uint16_t ret = 0xff;
+
+ ret = *(uint16_t *) &(mem[addr & 0x3fff]);
+
+ return ret;
+}
+
static lxt_ems_board_t *
lxt_ems_init(lxt_t *parent, int en, uint16_t io, uint32_t mem)
{
@@ -186,10 +205,17 @@ lxt_ems_init(lxt_t *parent, int en, uint16_t io, uint32_t mem)
for (uint8_t i = 0; i < 4; i++) {
uint8_t *ptr = dev->ram + (i << 14);
- mem_mapping_add(&dev->ems[i].mapping, 0xe0000 + (i << 14), 0x4000,
- lxt_ems_read, NULL, NULL,
- lxt_ems_write, NULL, NULL,
- ptr, 0, ptr);
+ if (parent->is_lxt3)
+ mem_mapping_add(&dev->ems[i].mapping, 0xe0000 + (i << 14), 0x4000,
+ lxt_ems_read, lxt_ems_readw, NULL,
+ lxt_ems_write, lxt_ems_writew, NULL,
+ ptr, 0, ptr);
+ else
+ mem_mapping_add(&dev->ems[i].mapping, 0xe0000 + (i << 14), 0x4000,
+ lxt_ems_read, NULL, NULL,
+ lxt_ems_write, NULL, NULL,
+ ptr, 0, ptr);
+
mem_mapping_disable(&dev->ems[i].mapping);
dev->ems[i].page = 0x7f;
diff --git a/src/machine/machine.c b/src/machine/machine.c
index b171dd505..505674000 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -139,18 +139,24 @@ machine_init(void)
int
machine_available(int m)
{
- int ret;
+ int ret = 0;
const device_t *dev = machine_get_device(m);
- bios_only = 1;
+ if (dev != NULL)
+ ret = machine_device_available(dev);
+ /*
+ Only via machine_init_ex() if the device is NULL or
+ it lacks a CONFIG_BIOS field (or the CONFIG_BIOS field
+ is not the first in list.
+ */
+ if (ret == 0) {
+ bios_only = 1;
- ret = device_available(dev);
- /* Do not check via machine_init_ex() if the device is not NULL and
- it has a CONFIG_BIOS field. */
- if ((dev == NULL) || (ret != -1))
ret = machine_init_ex(m);
- bios_only = 0;
+ bios_only = 0;
+ } else if (ret == -2)
+ ret = 0;
return !!ret;
}
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 7e0ae8d64..34e69ed24 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -68,6 +68,7 @@ extern const device_t ibmxt286_device;
extern const device_t pb450_device;
extern const device_t jukopc_device;
extern const device_t vendex_device;
+extern const device_t c5sbm2_device;
const machine_filter_t machine_types[] = {
{ "None", MACHINE_TYPE_NONE },
@@ -5632,6 +5633,46 @@ const machine_t machines[] = {
.snd_device = NULL,
.net_device = NULL
},
+ /* Has Award KBC firmware. */
+ {
+ .name = "[SiS 310] ASUS 386/33-64K",
+ .internal_name = "asus386_3364k",
+ .type = MACHINE_TYPE_386DX,
+ .chipset = MACHINE_CHIPSET_SIS_310,
+ .init = machine_at_asus386_3364k_init,
+ .p1_handler = NULL,
+ .gpio_handler = NULL,
+ .available_flag = MACHINE_AVAILABLE,
+ .gpio_acpi_handler = NULL,
+ .cpu = {
+ .package = CPU_PKG_386DX,
+ .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_AT,
+ .flags = MACHINE_APM,
+ .ram = {
+ .min = 1024,
+ .max = 16384,
+ .step = 1024
+ },
+ .nvrmask = 127,
+ .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 AMIKey F KBC firmware. */
{
.name = "[SiS 310] ASUS ISA-386C",
@@ -5998,6 +6039,46 @@ const machine_t machines[] = {
},
/* 486 machines - Socket 1 */
+ /* Has Award KBC firmware. */
+ {
+ .name = "[ZyMOS Poach] ASUS ISA-486C",
+ .internal_name = "isa486c",
+ .type = MACHINE_TYPE_486,
+ .chipset = MACHINE_CHIPSET_ZYMOS_POACH,
+ .init = machine_at_isa486c_init,
+ .p1_handler = NULL,
+ .gpio_handler = NULL,
+ .available_flag = MACHINE_AVAILABLE,
+ .gpio_acpi_handler = NULL,
+ .cpu = {
+ .package = CPU_PKG_SOCKET1,
+ .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_AT,
+ .flags = MACHINE_APM,
+ .ram = {
+ .min = 1024,
+ .max = 16384,
+ .step = 1024
+ },
+ .nvrmask = 127,
+ .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 AMI KF KBC firmware. */
{
.name = "[ZyMOS Poach] Genoa Unknown 486",
@@ -11465,7 +11546,7 @@ const machine_t machines[] = {
/* SiS 5501 */
/* Has the Lance LT38C41 KBC. */
{
- .name = "[SiS 5501] Chaintech 5SBM2 (M103)",
+ .name = "[SiS 5501] Chaintech 5SBM/5SBM2 (M103)",
.internal_name = "5sbm2",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_SIS_5501,
@@ -11488,7 +11569,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL | MACHINE_APM,
.ram = {
.min = 8192,
- .max = 262144,
+ .max = 131072,
.step = 8192
},
.nvrmask = 255,
@@ -11496,7 +11577,7 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
- .device = NULL,
+ .device = &c5sbm2_device,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
@@ -14730,7 +14811,7 @@ const machine_t machines[] = {
.block = CPU_BLOCK_NONE,
.min_bus = 60000000,
.max_bus = 83333333,
- .min_voltage = 1800,
+ .min_voltage = 2800,
.max_voltage = 3500,
.min_multi = 1.5,
.max_multi = 8.0
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index c2e5e4df4..64bcd01e5 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -457,6 +457,7 @@ if (UNIX AND NOT APPLE AND NOT HAIKU)
set(WL_SOURCE_VAR)
ecm_add_wayland_client_protocol(WL_SOURCE_VAR PROTOCOL ${CMAKE_SOURCE_DIR}/wl_protocols/relative-pointer-unstable-v1.xml BASENAME relative-pointer-unstable-v1)
ecm_add_wayland_client_protocol(WL_SOURCE_VAR PROTOCOL ${CMAKE_SOURCE_DIR}/wl_protocols/pointer-constraints-unstable-v1.xml BASENAME pointer-constraints-unstable-v1)
+ ecm_add_wayland_client_protocol(WL_SOURCE_VAR PROTOCOL ${CMAKE_SOURCE_DIR}/wl_protocols/keyboard-shortcuts-inhibit-unstable-v1.xml BASENAME keyboard-shortcuts-inhibit-unstable-v1)
target_include_directories(ui PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Qt${QT_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
target_sources(ui PRIVATE ${WL_SOURCE_VAR} wl_mouse.cpp)
if (XKBCOMMON_FOUND)
diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot
index 6e6dd3fc3..ac379b171 100644
--- a/src/qt/languages/86box.pot
+++ b/src/qt/languages/86box.pot
@@ -630,9 +630,6 @@ msgstr ""
msgid " - PAUSED"
msgstr ""
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr ""
-
msgid "Speed"
msgstr ""
@@ -864,9 +861,6 @@ msgstr ""
msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
msgstr ""
-msgid "Entering fullscreen mode"
-msgstr ""
-
msgid "Don't show this message again"
msgstr ""
@@ -1305,7 +1299,7 @@ msgstr ""
msgid "\nFalling back to software rendering."
msgstr ""
-msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgid "When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.
"
msgstr ""
msgid "This machine might have been moved or copied."
@@ -2112,9 +2106,6 @@ msgstr ""
msgid "Ask for confirmation before quitting"
msgstr ""
-msgid "Display hotkey message when entering full-screen mode"
-msgstr ""
-
msgid "Options"
msgstr ""
diff --git a/src/qt/languages/ca-ES.po b/src/qt/languages/ca-ES.po
index 4851106cd..632af979a 100644
--- a/src/qt/languages/ca-ES.po
+++ b/src/qt/languages/ca-ES.po
@@ -630,9 +630,6 @@ msgstr "Error fatal"
msgid " - PAUSED"
msgstr " - EN PAUSA"
-msgid "Press %s to return to windowed mode."
-msgstr "Premeu %s per tornar al mode de finestra."
-
msgid "Speed"
msgstr "Velocitat"
@@ -717,11 +714,11 @@ msgstr "Altres perifèrics"
msgid "Click to capture mouse"
msgstr "Feu clic per capturar el ratolí"
-msgid "Press %s to release mouse"
-msgstr "Premeu %s per alliberar el ratolí"
+msgid "Press %1 to release mouse"
+msgstr "Premeu %1 per alliberar el ratolí"
-msgid "Press %s or middle button to release mouse"
-msgstr "Premeu %s o el botó central per alliberar el ratolí"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Premeu %1 o el botó central per alliberar el ratolí"
msgid "Bus"
msgstr "Bus"
@@ -864,9 +861,6 @@ msgstr "%1 és necessària per a la conversió automàtica de fitxers PostScript
msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
msgstr "%1 és necessària per a la conversió automàtica de fitxers PCL a PDF.\n\nQualsevol document enviat a la impressora genèrica PCL es desarà com a fitxer Printer Command Language (.pcl)."
-msgid "Entering fullscreen mode"
-msgstr "Entrant en mode pantalla completa"
-
msgid "Don't show this message again"
msgstr "No mostreu més aquest missatge"
@@ -1305,8 +1299,8 @@ msgstr "Error en inicialitzar OpenGL"
msgid "\nFalling back to software rendering."
msgstr "\nTornant al renderitzador software."
-msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
-msgstr "<html><head/><body><p>Quan seleccioneu imatges de suports (CD-ROM, disquet, etc.), el diàleg obert s’iniciarà al mateix directori que el fitxer de configuració 86Box. Aquesta configuració només farà una diferència en les macOS.</p></body></html>"
+msgid "When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.
"
+msgstr "Quan seleccioneu imatges de suports (CD-ROM, disquet, etc.), el diàleg obert s’iniciarà al mateix directori que el fitxer de configuració 86Box. Aquesta configuració només farà una diferència en les macOS.
"
msgid "This machine might have been moved or copied."
msgstr "Aquesta màquina podria haver estat moguda o copiada."
@@ -2106,9 +2100,6 @@ msgstr ""
msgid "Ask for confirmation before quitting"
msgstr ""
-msgid "Display hotkey message when entering full-screen mode"
-msgstr ""
-
msgid "Options"
msgstr ""
diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index 352fafc31..593020962 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -630,9 +630,6 @@ msgstr "Kritická chyba"
msgid " - PAUSED"
msgstr " - POZASTAVENO"
-msgid "Press %s to return to windowed mode."
-msgstr "Stiskněte %s pro návrat z režimu celé obrazovky."
-
msgid "Speed"
msgstr "Rychlost"
@@ -717,11 +714,11 @@ msgstr "Jiné příslušenství"
msgid "Click to capture mouse"
msgstr "Klikněte pro zabraní myši"
-msgid "Press %s to release mouse"
-msgstr "Stiskněte %s pro uvolnění myši"
+msgid "Press %1 to release mouse"
+msgstr "Stiskněte %1 pro uvolnění myši"
-msgid "Press %s or middle button to release mouse"
-msgstr "Stiskněte %s nebo prostřední tlačítko pro uvolnění myši"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Stiskněte %1 nebo prostřední tlačítko pro uvolnění myši"
msgid "Bus"
msgstr "Sběrnice"
@@ -864,9 +861,6 @@ msgstr "%1 je potřeba pro automatický převod PostScript dokumentů do PDF.\n\
msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
msgstr "%1 je potřeba pro automatický převod PCL dokumentů do PDF.\n\nJakékoliv dokumenty vytisknuté přes obecnou PCL-ovou tiskárnu budou uloženy jako Printer Command Language (.pcl) soubory."
-msgid "Entering fullscreen mode"
-msgstr "Vstup do režimu celé obrazovky"
-
msgid "Don't show this message again"
msgstr "Nezobrazovat dále tuto zprávu"
@@ -1305,8 +1299,8 @@ msgstr "Chyba při inicializaci OpenGL"
msgid "\nFalling back to software rendering."
msgstr "\nNávrat k softwarovému vykreslování."
-msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
-msgstr "<html><head/><body><p>Při výběru obrazů médií (CD-ROM, disketa atd.) se otevřené dialogové okno spustí ve stejném adresáři jako konfigurační soubor 86Box. Toto nastavení bude mít pravděpodobně význam pouze v systému MacOS.</p></body></html>"
+msgid "When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.
"
+msgstr "Při výběru obrazů médií (CD-ROM, disketa atd.) se otevřené dialogové okno spustí ve stejném adresáři jako konfigurační soubor 86Box. Toto nastavení bude mít pravděpodobně význam pouze v systému MacOS.
"
msgid "This machine might have been moved or copied."
msgstr "Tento počítač mohl být přemístěn nebo zkopírován."
@@ -2106,9 +2100,6 @@ msgstr ""
msgid "Ask for confirmation before quitting"
msgstr ""
-msgid "Display hotkey message when entering full-screen mode"
-msgstr ""
-
msgid "Options"
msgstr ""
diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po
index ce7d52d55..439346608 100644
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -630,9 +630,6 @@ msgstr "Fataler Fehler"
msgid " - PAUSED"
msgstr " - PAUSIERT"
-msgid "Press %s to return to windowed mode."
-msgstr "%s ab, zur Rückkehr in den Fenstermodus."
-
msgid "Speed"
msgstr "Geschwindigkeit"
@@ -717,14 +714,11 @@ msgstr "Andere Peripheriegeräte"
msgid "Click to capture mouse"
msgstr "Klicken zum Einfangen des Mauszeigers"
-msgid "Press %s to release mouse"
-msgstr "Drücke %s zur Mausfreigabe"
+msgid "Press %1 to release mouse"
+msgstr "Drücke %1 zur Mausfreigabe"
-msgid "Press %s or middle button to release mouse"
-msgstr "Drücke %s oder die mittlere Maustaste zur Mausfreigabe"
-
-msgid "Ctrl+End"
-msgstr "Strg+Ende"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Drücke %1 oder die mittlere Maustaste zur Mausfreigabe"
msgid "Bus"
msgstr "Bus"
@@ -867,9 +861,6 @@ msgstr "%1 wird zur automatischen Konvertierung von PostScript-Dateien ins PDF-F
msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
msgstr "%1 wird zur automatischen Konvertierung von PCL-Dateien ins PDF-Format benötigt.\n\nSämtliche an den generischen PCL-Drucker gesendete Dateien werden als Printer Command Language (*.pcl) Dateien gesichert."
-msgid "Entering fullscreen mode"
-msgstr "Vollbildmodus wird aktiviert"
-
msgid "Don't show this message again"
msgstr "Diese Nachricht nicht mehr anzeigen"
@@ -1308,8 +1299,8 @@ msgstr "Fehler beim Initialisieren von OpenGL"
msgid "\nFalling back to software rendering."
msgstr "\nRückgriff auf Software-Rendering."
-msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
-msgstr "<html><head/><body><p>Bei der Auswahl von Medien-Abbildern (CD-ROM, Diskette usw.) wird der Öffnungsdialog im selben Verzeichnis wie die 86Box-Konfigurationsdatei gestartet. Diese Einstellung macht wahrscheinlich nur unter macOS einen Unterschied.</p></body></html>"
+msgid "When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.
"
+msgstr "