diff --git a/src/codegen/codegen_ops_arith.h b/src/codegen/codegen_ops_arith.h index f1c426838..87f1640e6 100644 --- a/src/codegen/codegen_ops_arith.h +++ b/src/codegen/codegen_ops_arith.h @@ -744,7 +744,7 @@ rop81_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb host_reg = 0; } else { SAVE_EA(); - MEM_CHECK_WRITE(target_seg); + MEM_CHECK_WRITE_L(target_seg); host_reg = MEM_LOAD_ADDR_EA_L_NO_ABRT(target_seg); } } else { diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c index 08f1329be..e42516c3f 100644 --- a/src/disk/hdc_st506_xt.c +++ b/src/disk/hdc_st506_xt.c @@ -1733,6 +1733,12 @@ xebec_available(void) return (rom_present(XEBEC_BIOS_FILE)); } +static int +wdxt_available(void) +{ + return (rom_present(WDXT_GEN_BIOS_FILE)); +} + static int dtc5150x_available(void) { @@ -2141,13 +2147,13 @@ const device_t st506_xt_xebec_device = { const device_t st506_xt_wdxt_gen_device = { .name = "Western Digital WDXT-GEN (MFM)", - .internal_name = "st506_xt", + .internal_name = "st506_xt_gen", .flags = DEVICE_ISA, .local = (HDD_BUS_MFM << 8) | ST506_XT_TYPE_WDXT_GEN, .init = st506_init, .close = st506_close, .reset = NULL, - { .available = xebec_available }, + { .available = wdxt_available }, .speed_changed = NULL, .force_redraw = NULL, .config = NULL diff --git a/src/machine/m_pcjr.c b/src/machine/m_pcjr.c index 0b1f8ec58..c4d4ed53a 100644 --- a/src/machine/m_pcjr.c +++ b/src/machine/m_pcjr.c @@ -37,6 +37,7 @@ #include <86box/pit.h> #include <86box/mem.h> #include <86box/device.h> +#include <86box/gameport.h> #include <86box/serial.h> #include <86box/keyboard.h> #include <86box/rom.h> @@ -815,5 +816,8 @@ machine_pcjr_init(const machine_t *model) device_add(&ns8250_pcjr_device); serial_set_next_inst(SERIAL_MAX); /* So that serial_standalone_init() won't do anything. */ + /* "All the inputs are 'read' with one 'IN' from address hex 201." - PCjr Technical Reference (Nov. 83), p.2-119 */ + standalone_gameport_type = &gameport_201_device; + return ret; } diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index a29b6de95..188474a23 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -8584,7 +8584,7 @@ const machine_t machines[] = { { .name = "[i430FX] DataExpert EXP8551", .internal_name = "exp8551", - .type = MACHINE_TYPE_SOCKET5, + .type = MACHINE_TYPE_SOCKET7_3V, .chipset = MACHINE_CHIPSET_INTEL_430FX, .init = machine_at_exp8551_init, .pad = 0, @@ -8906,7 +8906,7 @@ const machine_t machines[] = { { .name = "[i430FX] PC Partner MB500N", .internal_name = "mb500n", - .type = MACHINE_TYPE_SOCKET5, + .type = MACHINE_TYPE_SOCKET7_3V, .chipset = MACHINE_CHIPSET_INTEL_430FX, .init = machine_at_mb500n_init, .pad = 0, diff --git a/src/qt/qt_settings.ui b/src/qt/qt_settings.ui index ec3198ebe..7b4d28bec 100644 --- a/src/qt/qt_settings.ui +++ b/src/qt/qt_settings.ui @@ -6,20 +6,20 @@ 0 0 - 831 - 595 + 800 + 570 - 831 - 595 + 800 + 570 - 831 - 595 + 800 + 570 @@ -29,6 +29,12 @@ + + 0 + + + 0 + diff --git a/src/qt/qt_settingsdisplay.ui b/src/qt/qt_settingsdisplay.ui index c9bbaf1c7..c34c7aa38 100644 --- a/src/qt/qt_settingsdisplay.ui +++ b/src/qt/qt_settingsdisplay.ui @@ -13,7 +13,7 @@ Form - + 0 @@ -26,14 +26,108 @@ 0 - + + + + + 0 + 0 + + + + Configure + + + + + + + XGA + + + + + + + + 0 + 0 + + + + Video: + + + + + + + + 0 + 0 + + + + + + + + Configure + + + + + + + + 0 + 0 + + + + Video #2: + + + + 8514/A - + + + + Voodoo Graphics + + + + + + + Configure + + + + + + + Configure + + + + + + + + 0 + 0 + + + + + Qt::Vertical @@ -46,74 +140,6 @@ - - - - - - - - 0 - 0 - - - - Configure - - - - - - - Voodoo Graphics - - - - - - - Configure - - - - - - - Video: - - - - - - - XGA - - - - - - - Configure - - - - - - - Video #2: - - - - - - - - - - Configure - - - diff --git a/src/qt/qt_settingsnetwork.ui b/src/qt/qt_settingsnetwork.ui index 763537c9e..d781a1beb 100644 --- a/src/qt/qt_settingsnetwork.ui +++ b/src/qt/qt_settingsnetwork.ui @@ -7,7 +7,7 @@ 0 0 548 - 458 + 488 @@ -27,302 +27,426 @@ 0 - - - Network Interface Contollers + + + 0 - - - - - - 0 - 0 - - - - Adapter - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Configure - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Card 3: - - - - - - - - 0 - 0 - - - - QComboBox::AdjustToContents - - - - - - - - 0 - 0 - - - - Card 1: - - - - - - - - 0 - 0 - - - - Interface - - - - - - - - 0 - 0 - - - - QComboBox::AdjustToContents - - - - - - - - 0 - 0 - - - - Configure - - - - - - - - 0 - 0 - - - - QComboBox::AdjustToContents - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Card 4: - - - - - - - - 0 - 0 - - - - Mode - - - - - - - - 0 - 0 - - - - Card 2: - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Configure - - - - - - - - 0 - 0 - - - - Configure - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - QComboBox::AdjustToContents - - - - + + + Network Card #1 + + + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + + + + + + 0 + 0 + + + + Adapter + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Configure + + + + + + + + 0 + 0 + + + + Interface + + + + + + + + 0 + 0 + + + + Mode + + + + + + + + 0 + 0 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Network Card #2 + + + + + + + 0 + 0 + + + + Interface + + + + + + + + 0 + 0 + + + + Mode + + + + + + + + 0 + 0 + + + + Adapter + + + + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + Configure + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Network Card #3 + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Adapter + + + + + + + + 0 + 0 + + + + Mode + + + + + + + + 0 + 0 + + + + Interface + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Configure + + + + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Network Card #4 + + + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + + + + + + 0 + 0 + + + + Configure + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Interface + + + + + + + + 0 + 0 + + + + Adapter + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Mode + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - -