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

Fixed the warning in mem.c;

Browse Source 
Scan code E0 00 (fake scan code seen with USB keyboards' special keys on Windows) is no longer passed through.
This commit is contained in:
OBattler
2018-01-21 13:34:07 +01:00
parent f7cdc0f5b4
commit 2b8b4d5ba4
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mem.c
View File

@@ -261,22 +261,24 @@ int mmu_page_fault_check(uint32_t addr, int rw, uint32_t flags, int pde, int is_
uint32_t mem_readl_phys(uint32_t addr) uint32_t mem_readl_phys(uint32_t addr)
{ {
uint8_t i, temp[4]; uint8_t i, temp[4];
uint32_t ta; uint32_t ta, *tv;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
ta = addr + i; ta = addr + i;
temp[i] = _mem_exec[ta >> 14][ta & 0x3fff]; temp[i] = _mem_exec[ta >> 14][ta & 0x3fff];
} }
return *(uint32_t *) temp; tv = (uint32_t *) temp;
return *tv;
} }
void mem_writel_phys(uint32_t addr, uint32_t val) void mem_writel_phys(uint32_t addr, uint32_t val)
{ {
uint8_t i, temp[4]; uint8_t i, temp[4];
uint32_t ta; uint32_t ta, *tv;
*(uint32_t *) temp = val; tv = (uint32_t *) temp;
*tv = val;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
ta = addr + i; ta = addr + i;
@@ -1535,7 +1537,9 @@ void mem_split_enable(int max_size, uint32_t addr)
if (split_mapping_enabled) if (split_mapping_enabled)
return; return;
// pclog("Split mapping enable at %08X\n", addr); #if 0
pclog("Split mapping enable at %08X\n", addr);
#endif
mem_set_mem_state(addr, max_size * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL); mem_set_mem_state(addr, max_size * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
mem_mapping_set_addr(&ram_split_mapping, addr, max_size * 1024); mem_mapping_set_addr(&ram_split_mapping, addr, max_size * 1024);
@@ -1565,7 +1569,9 @@ void mem_split_disable(int max_size, uint32_t addr)
if (!split_mapping_enabled) if (!split_mapping_enabled)
return; return;
// pclog("Split mapping disable at %08X\n", addr); #if 0
pclog("Split mapping disable at %08X\n", addr);
#endif
if (max_size == 384) if (max_size == 384)
memcpy(mem_split_buffer, &ram[addr], max_size); memcpy(mem_split_buffer, &ram[addr], max_size);
@@ -1683,6 +1689,8 @@ static int port_92_reg = 0;
void mem_a20_recalc(void) void mem_a20_recalc(void)
{ {
int state;
if (!AT) { if (!AT) {
rammask = 0xfffff; rammask = 0xfffff;
flushmmucache(); flushmmucache();
@@ -1690,7 +1698,7 @@ void mem_a20_recalc(void)
return; return;
} }
int state = mem_a20_key | mem_a20_alt; state = mem_a20_key | mem_a20_alt;
if (state && !mem_a20_state) if (state && !mem_a20_state)
{ {
rammask = (AT && cpu_16bitbus) ? 0xffffff : 0xffffffff; rammask = (AT && cpu_16bitbus) ? 0xffffff : 0xffffffff;

2
src/win/win_dialog.c
View File

@@ -198,6 +198,8 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, int save)
wcstombs(openfilestring, wopenfilestring, sizeof(openfilestring)); wcstombs(openfilestring, wopenfilestring, sizeof(openfilestring));
// pclog("File dialog return true\n"); // pclog("File dialog return true\n");
pclog("Filter Index: %i\n", ofn.nFilterIndex);
return(0); return(0);
} }