80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed memory state for PS/2 split mapping on models 70 and 80 (broken by recent mem.c changes).

Browse Source
This commit is contained in:
OBattler
2020-07-02 00:21:46 +02:00
parent 8ebcfe766e
commit 808fa292f6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine/m_ps2_mca.c
View File

@@ -965,6 +965,11 @@ static void mem_encoding_update()
{ {
mem_mapping_disable(&ps2.split_mapping); mem_mapping_disable(&ps2.split_mapping);
if (ps2.split_size > 0)
mem_set_mem_state(ps2.split_addr, ps2.split_size << 10, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
if (((mem_size << 10) - (1 << 20)) > 0)
mem_set_mem_state(1 << 20, (mem_size << 10) - (1 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
ps2.split_addr = ((uint32_t) (ps2.mem_regs[0] & 0xf)) << 20; ps2.split_addr = ((uint32_t) (ps2.mem_regs[0] & 0xf)) << 20;
if (ps2.mem_regs[1] & 2) { if (ps2.mem_regs[1] & 2) {
@@ -993,12 +998,15 @@ static void mem_encoding_update()
ps2.split_phys = 0xa0000; ps2.split_phys = 0xa0000;
} }
mem_set_mem_state(ps2.split_addr, ps2.split_size << 10, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
mem_mapping_set_exec(&ps2.split_mapping, &ram[ps2.split_phys]); mem_mapping_set_exec(&ps2.split_mapping, &ram[ps2.split_phys]);
mem_mapping_set_addr(&ps2.split_mapping, ps2.split_addr, ps2.split_size << 10); mem_mapping_set_addr(&ps2.split_mapping, ps2.split_addr, ps2.split_size << 10);
ps2_mca_log("PS/2 Model 80-111: Split memory block enabled at %08X\n", ps2.split_addr); ps2_mca_log("PS/2 Model 80-111: Split memory block enabled at %08X\n", ps2.split_addr);
} else } else {
ps2.split_size = 0;
ps2_mca_log("PS/2 Model 80-111: Split memory block disabled\n"); ps2_mca_log("PS/2 Model 80-111: Split memory block disabled\n");
}
} }
static uint8_t mem_encoding_read(uint16_t addr, void *p) static uint8_t mem_encoding_read(uint16_t addr, void *p)
@@ -1242,6 +1250,8 @@ static void ps2_mca_board_model_80_type2_init(int is486)
if (gfxcard == VID_INTERNAL) if (gfxcard == VID_INTERNAL)
device_add(&ps1vga_mca_device); device_add(&ps1vga_mca_device);
ps2.split_size = 0;
} }