claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2021-11-21 14:20:49 -03:00
parent 5af0db8075 0c307c2058
commit 87f7067bdd
25 changed files with 781 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/m_ps2_mca.c
View File

@@ -483,11 +483,13 @@ static void model_55sx_write(uint16_t port, uint8_t val)
if (shadowbios)
{
mem_set_mem_state(0xe0000, 0x20000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
mem_set_mem_state((mem_size+256) * 1024, 128 * 1024, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
mem_mapping_disable(&ps2.shadow_mapping);
}
else
{
mem_set_mem_state(0xe0000, 0x20000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
mem_set_mem_state((mem_size+256) * 1024, 128 * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
mem_mapping_enable(&ps2.shadow_mapping);
}
@@ -495,6 +497,8 @@ static void model_55sx_write(uint16_t port, uint8_t val)
mem_set_mem_state(mem_size * 1024, 256 * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
else
mem_set_mem_state(mem_size * 1024, 256 * 1024, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
flushmmucache_nopc();
break;
case 0x106:
ps2.subaddr_lo = val;
@@ -1019,6 +1023,8 @@ static void mem_encoding_update()
ps2.split_size = 0;
ps2_mca_log("PS/2 Model 80-111: Split memory block disabled\n");
}
flushmmucache_nopc();
}
static uint8_t mem_encoding_read(uint16_t addr, void *p)