Merge remote-tracking branch 'origin/master' into version/4.1

2023-08-12 01:18:57 +02:00
parent 956788f3ef 74dd313ce0
commit b12a698b9d
72 changed files with 6930 additions and 6418 deletions
--- a/src/include/86box/vid_ega.h
+++ b/src/include/86box/vid_ega.h
@@ -44,9 +44,9 @@ typedef struct ega_t {
    uint8_t colournocare;
    uint8_t scrblank;
    uint8_t plane_mask;
+    uint8_t ctl_mode;
    uint8_t pad;
    uint8_t pad0;
-    uint8_t pad1;
    uint8_t crtc[32];
    uint8_t gdcreg[16];
    uint8_t attrregs[32];