Merge branch 'master' of ssh://github.com/86Box/86Box
This commit is contained in:
@@ -807,10 +807,6 @@ machine_at_pc8_init(const machine_t *model)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Current bugs:
|
|
||||||
* - ctrl-alt-del produces an 8042 error
|
|
||||||
*/
|
|
||||||
int
|
int
|
||||||
machine_at_3302_init(const machine_t *model)
|
machine_at_3302_init(const machine_t *model)
|
||||||
{
|
{
|
||||||
@@ -820,8 +816,8 @@ machine_at_3302_init(const machine_t *model)
|
|||||||
0x000f0000, 65536, 0);
|
0x000f0000, 65536, 0);
|
||||||
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
bios_load_aux_linear("roms/machines/3302/f800-setup_ncr3.5-013190.bin",
|
ret &= bios_load_aux_linear("roms/machines/3302/f800-setup_ncr3.5-013190.bin",
|
||||||
0x000f8000, 32768, 0);
|
0x000f8000, 32768, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bios_only || !ret)
|
if (bios_only || !ret)
|
||||||
|
Reference in New Issue
Block a user