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

Implemented the National Semiconductors PC87307, PC87309, PC87332, and PC97307 Super I/O chips, fixed a number of bugs, and removed two machines from the Dev branch due to them now having the correct Super I/O chips.

Browse Source
This commit is contained in:
OBattler
2020-06-14 21:59:45 +02:00
parent eae3f9b030
commit 8837d5d882
25 changed files with 1472 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mem/mem.c
View File

@@ -2129,7 +2129,8 @@ mem_mapping_read_allowed(uint32_t flags, uint32_t state, int exec)
break;
default:
fatal("mem_mapping_read_allowed : bad state %x\n", state);
if (state_masked != MEM_READ_DISABLED)
fatal("mem_mapping_read_allowed : bad state %x\n", state_masked);
break;
}
@@ -2176,7 +2177,8 @@ mem_mapping_write_allowed(uint32_t flags, uint32_t state)
break;
default:
fatal("mem_mapping_write_allowed : bad state %x\n", state);
if (state_masked != MEM_WRITE_DISABLED)
fatal("mem_mapping_write_allowed : bad state %x\n", state_masked);
break;
}

10
src/mem/rom.c
View File

@@ -382,11 +382,11 @@ bios_load_linear_combined2(wchar_t *fn1, wchar_t *fn2, wchar_t *fn3, wchar_t *fn
{
uint8_t ret = 0;
ret = bios_load_linear(fn3, 0x000f0000, 262144, 128);
ret &= bios_load_aux_linear(fn1, 0x000d0000, 65536, 128);
ret &= bios_load_aux_linear(fn2, 0x000c0000, 65536, 128);
ret &= bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, 128);
ret &= bios_load_aux_linear(fn5, 0x000ec000, 16384, 128);
ret = bios_load_linear(fn3, 0x000f0000, 262144, off);
ret &= bios_load_aux_linear(fn1, 0x000d0000, 65536, off);
ret &= bios_load_aux_linear(fn2, 0x000c0000, 65536, off);
ret &= bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off);
ret &= bios_load_aux_linear(fn5, 0x000ec000, 16384, off);
return ret;
}