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

Merge branch '86Box:master' into machine_23

Browse Source
This commit is contained in:
BurnedPinguin
2023-07-22 21:58:57 +02:00
committed by GitHub
parent 590873f72f 2d70685ef6
commit 6a18980528
6 changed files with 298 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/m_at_286_386sx.c
View File

@@ -807,10 +807,6 @@ machine_at_pc8_init(const machine_t *model)
return ret;
}
/*
* Current bugs:
* - ctrl-alt-del produces an 8042 error
*/
int
machine_at_3302_init(const machine_t *model)
{
@@ -820,8 +816,8 @@ machine_at_3302_init(const machine_t *model)
0x000f0000, 65536, 0);
if (ret) {
bios_load_aux_linear("roms/machines/3302/f800-setup_ncr3.5-013190.bin",
0x000f8000, 32768, 0);
ret &= bios_load_aux_linear("roms/machines/3302/f800-setup_ncr3.5-013190.bin",
0x000f8000, 32768, 0);
}
if (bios_only || !ret)