From 233ec2ddf356262091537bba7a79cd4618512203 Mon Sep 17 00:00:00 2001 From: tiseno100 <58827426+tiseno100@users.noreply.github.com> Date: Tue, 29 Sep 2020 12:42:40 +0300 Subject: [PATCH] ACC 2168 improvements --- src/chipset/acc2168.c | 44 +++++++------------------------------ src/machine/machine_table.c | 2 +- 2 files changed, 9 insertions(+), 37 deletions(-) diff --git a/src/chipset/acc2168.c b/src/chipset/acc2168.c index cab02eed1..481d142a6 100644 --- a/src/chipset/acc2168.c +++ b/src/chipset/acc2168.c @@ -6,8 +6,7 @@ * * This file is part of the 86Box distribution. * - * Implementation of the ACC 2168 chipset - * used by the Packard Bell Legend 760 Supreme (PB410A or PB430). + * Implementation of the ACC 2168 chipset * * * @@ -24,52 +23,30 @@ #include "cpu.h" #include <86box/timer.h> #include <86box/device.h> -#include <86box/keyboard.h> #include <86box/io.h> #include <86box/mem.h> -#include <86box/mouse.h> #include <86box/port_92.h> -#include <86box/sio.h> -#include <86box/hdc.h> -#include <86box/video.h> #include <86box/chipset.h> +#define enabled_shadow (MEM_READ_INTERNAL | ((dev->regs[0x02] & 0x20) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL)) +#define disabled_shadow (MEM_READ_EXTANY | MEM_WRITE_EXTANY) typedef struct acc2168_t { int reg_idx; uint8_t regs[256]; - uint8_t port_78; } acc2168_t; - -/* - Based on reverse engineering using the AMI 386DX Clone BIOS: - Bit 0 of register 02 controls shadowing of C0000-C7FFF (1 = enabled, 0 = disabled); - Bit 1 of register 02 controls shadowing of C8000-CFFFF (1 = enabled, 0 = disabled); - Bit 2 of register 02 controls shadowing of D0000-DFFFF (1 = enabled, 0 = disabled); - Bit 3 of register 02 controls shadowing of E0000-EFFFF (1 = enabled, 0 = disabled); - Bit 4 of register 02 controls shadowing of F0000-FFFFF (1 = enabled, 0 = disabled); - Bit 5 is most likely: 1 = shadow enabled, 0 = shadow disabled; - Bit 6 of register 02 controls shadow RAM cacheability (1 = cacheable, 0 = non-cacheable). -*/ - static void acc2168_shadow_recalc(acc2168_t *dev) { - int state; - - if (dev->regs[0x02] & 0x20) - state = (dev->regs[0x02] & 0x20) ? (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY); - - mem_set_mem_state(0xc0000, 0x08000, (dev->regs[0x02] & 0x01) ? state : (MEM_READ_EXTANY | MEM_WRITE_EXTANY)); - mem_set_mem_state(0xc8000, 0x08000, (dev->regs[0x02] & 0x02) ? state : (MEM_READ_EXTANY | MEM_WRITE_EXTANY)); - mem_set_mem_state(0xd0000, 0x10000, (dev->regs[0x02] & 0x04) ? state : (MEM_READ_EXTANY | MEM_WRITE_EXTANY)); - mem_set_mem_state(0xe0000, 0x10000, (dev->regs[0x02] & 0x08) ? state : (MEM_READ_EXTANY | MEM_WRITE_EXTANY)); - mem_set_mem_state(0xf0000, 0x10000, (dev->regs[0x02] & 0x10) ? state : (MEM_READ_EXTANY | MEM_WRITE_EXTANY)); +mem_set_mem_state_both(0xc0000, 0x8000, ((dev->regs[0x01] & 0x01) ? enabled_shadow : disabled_shadow)); +mem_set_mem_state_both(0xc8000, 0x8000, ((dev->regs[0x01] & 0x02) ? enabled_shadow : disabled_shadow)); +mem_set_mem_state_both(0xd0000, 0x10000, ((dev->regs[0x01] & 0x04) ? enabled_shadow : disabled_shadow)); +mem_set_mem_state_both(0xe0000, 0x10000, ((dev->regs[0x01] & 0x08) ? enabled_shadow : disabled_shadow)); +mem_set_mem_state_both(0xf0000, 0x10000, ((dev->regs[0x01] & 0x10) ? enabled_shadow : disabled_shadow)); } - static void acc2168_write(uint16_t addr, uint8_t val, void *p) { @@ -120,11 +97,6 @@ acc2168_init(const device_t *info) device_add(&port_92_inv_device); - if (gfxcard != VID_INTERNAL) - dev->port_78 = 0x40; - else - dev->port_78 = 0; - return dev; } diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index cc6c8240d..0face4f74 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -185,7 +185,7 @@ const machine_t machines[] = { { "[MCA] IBM PS/2 model 55SX", "ibmps2_m55sx", MACHINE_TYPE_386SX, {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"IBM",cpus_IBM486SLC},{"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 8, 1, 63, machine_ps2_model_55sx_init, NULL }, /* 386DX machines */ - { "[ACC 2168] AMI 386DX clone", "acc386", MACHINE_TYPE_386DX, {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 16384, 128, 127, machine_at_acc386_init, NULL }, + { "[ACC 2168] AMI 386DX clone", "acc386", MACHINE_TYPE_386DX, {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 1, 16, 1, 127, machine_at_acc386_init, NULL }, { "[SiS 310] ASUS ISA-386C", "asus386", MACHINE_TYPE_386DX, {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 16384, 128, 127, machine_at_asus386_init, NULL }, { "[ISA] Compaq Portable III (386)", "portableiii386", MACHINE_TYPE_386DX, {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_portableiii386_init, at_cpqiii_get_device }, { "[ISA] Micronics 386 clone", "micronics386", MACHINE_TYPE_386DX, {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_micronics386_init, NULL },