Merge branch '86Box:master' into nec-v20

This commit is contained in:
Jasmine Iwanek
2022-05-22 22:48:46 -04:00
committed by GitHub
19 changed files with 3972 additions and 22 deletions

View File

@@ -36,6 +36,8 @@
#include <86box/pci.h>
#include <86box/ppi.h>
#include <86box/timer.h>
#include <86box/video.h>
#include <86box/vid_svga.h>
/* The opcode of the instruction currently being executed. */
uint8_t opcode;
@@ -341,6 +343,9 @@ softresetx86(void)
if (soft_reset_mask)
return;
if (ibm8514_enabled)
vga_on = 1;
reset_common(0);
}