Merge branch 'master' of https://github.com/86Box/86Box

.github/workflows/c-cpp.yml

@@ -1,4 +1,4 @@
-name: MinGW64 Makefile
+name: MSYS2 Makefile
 
 on:
 
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.environment.msystem }} Makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
+    name: MSYS2 Makefile build ${{ matrix.build.name }} ${{ matrix.dynarec.name }} build (${{ matrix.environment.msystem }})
 
     runs-on: windows-latest
 
@@ -27,8 +27,22 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        dev-build: ['y', 'n']
-        new-dynarec: ['y', 'n']
+        build:
+          - name: Debug
+            debug: y
+            dev: n
+            slug: -Debug
+          - name: Dev
+            debug: y
+            dev: y
+            slug: -Dev
+        dynarec:
+          - name: ODR
+            new: n
+            slug: -ODR
+          - name: NDR
+            new: y
+            slug: -NDR
         environment:
           - msystem: MINGW32
             prefix: mingw-w64-i686
@@ -54,5 +68,9 @@ jobs:
           ${{ matrix.environment.prefix }}-rtmidi
     - uses: actions/checkout@v3
     - name: make
-      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} VNC=n
+      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.build.dev }} DEBUG=${{ matrix.build.debug }} NEW_DYNAREC=${{ matrix.dynarec.new }} X64=${{ matrix.environment.x64 }} VNC=n
       working-directory: ./src
+    - uses: actions/upload-artifact@v3
+      with:
+        name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
+        path: src/86Box.exe

src/include/86box/machine.h

@@ -792,6 +792,7 @@ extern int machine_xt_v20xt_init(const machine_t *);
 
 extern int machine_xt_iskra3104_init(const machine_t *);
 extern int machine_xt_pravetz16_imko4_init(const machine_t *);
+extern int machine_xt_micoms_xl7turbo_init(const machine_t *);
 
 /* m_xt_compaq.c */
 extern int machine_xt_compaq_deskpro_init(const machine_t *);

src/machine/m_xt.c

@@ -334,25 +334,24 @@ machine_xt_pravetz16_imko4_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/pravetz16/BIOS_IMKO4_FE00.bin",
+    ret = bios_load_linear("roms/machines/pravetz16/BIOS_IMKO4_FE00.BIN",
                            0x000fe000, 65536, 0);
-    if (ret) {
-        ret = bios_load_aux_linear("roms/machines/pravetz16/IMKO4-D34_SGS-M2764ADIP28.BIN",
-                                   0x000f4000, 8192, 0);
+    if (ret) 
+    {
+        bios_load_aux_linear("roms/machines/pravetz16/BIOS_IMKO4_F400.BIN",
+                                 0x000f4000, 8192, 0);
 
-        if (ret) {
-            bios_load_aux_linear("roms/machines/pravetz16/1.bin",
+        bios_load_aux_linear("roms/machines/pravetz16/BIOS_IMKO4_F600.BIN",
                                  0x000f6000, 8192, 0);
 
-            bios_load_aux_linear("roms/machines/pravetz16/2.bin",
+        bios_load_aux_linear("roms/machines/pravetz16/BIOS_IMKO4_FA00.BIN",
                                  0x000fa000, 8192, 0);
 
-            bios_load_aux_linear("roms/machines/pravetz16/5.bin",
+        bios_load_aux_linear("roms/machines/pravetz16/BIOS_IMKO4_F800.BIN",
                                  0x000f8000, 8192, 0);
 
-            bios_load_aux_linear("roms/machines/pravetz16/6.bin",
+        bios_load_aux_linear("roms/machines/pravetz16/BIOS_IMKO4_FC00.BIN",
                                  0x000fc000, 8192, 0);
-        }
     }
 
     if (bios_only || !ret)
@@ -365,6 +364,21 @@ machine_xt_pravetz16_imko4_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_xt_micoms_xl7turbo_init(const machine_t *model)
+{
+	int ret;
+    
+    ret = bios_load_linear("roms/machines/mxl7t/XL7_TURBO.BIN",
+			   0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+	    return ret;
+
+    machine_xt_init_ex(model);
+    return ret;
+}
+
 int
 machine_xt_pc4i_init(const machine_t *model)
 {

src/machine/machine_table.c

@@ -923,6 +923,42 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    {
+        .name = "[8088] Micoms XL-7 Turbo",
+        .internal_name = "mxl7t",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_micoms_xl7turbo_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 64,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     {
         .name = "[8088] NCR PC4i",
         .internal_name = "pc4i",

src/video/vid_cga.c

@@ -540,7 +540,7 @@ cga_pravetz_init(const device_t *info)
 {
     cga_t *cga = cga_standalone_init(info);
 
-    loadfont("roms/video/cga/CGA - PRAVETZ.BIN", 10);
+    loadfont("roms/video/cga/PRAVETZ-VDC2.BIN", 10);
 
     io_removehandler(0x03dd, 0x0001, cga_in, NULL, NULL, cga_out, NULL, NULL, cga);
     io_sethandler(0x03dd, 0x0001, cga_pravetz_in, NULL, NULL, cga_pravetz_out, NULL, NULL, cga);