Merge pull request #4145 from Cacodemon345/c&t_69000

Chips & Technologies B69000 emulation

src/include/86box/video.h

@@ -579,6 +579,10 @@ extern const device_t velocity_200_agp_device;
 /* Wyse 700 */
 extern const device_t wy700_device;
 
+/* Chips & Technologies */
+extern const device_t chips_69000_device;
+extern const device_t chips_69000_onboard_device;
+
 #endif
 
 #endif /*EMU_VIDEO_H*/

src/machine/m_at_socket370.c

@@ -354,6 +354,9 @@ machine_at_awo671r_init(const machine_t *model)
     device_add_inst(&w83977ef_device, 2);
     device_add(&keyboard_ps2_pci_device);
     device_add(&sst_flash_39sf020_device);
+    if (gfxcard[0] == VID_INTERNAL) {
+        device_add(&chips_69000_onboard_device);
+    }
     spd_register(SPD_TYPE_SDRAM, 0x3, 256);
 
     return ret;

src/machine/machine_table.c

@@ -14338,7 +14338,7 @@ const machine_t machines[] = {
             .max_multi = 8.0 /* limits assumed */
         },
         .bus_flags = MACHINE_PS2_PCI, /* Machine has EISA, possibly for a riser? */
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal video: C&T B69000, sound: ESS ES1938S and NIC: Realtek RTL8139C */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB | MACHINE_VIDEO, /* Machine has internal video: C&T B69000, sound: ESS ES1938S and NIC: Realtek RTL8139C */
         .ram = {
             .min = 8192,
             .max = 524288,

src/video/CMakeLists.txt

@@ -26,7 +26,8 @@ add_library(vid OBJECT agpgart.c video.c vid_table.c vid_cga.c vid_cga_comp.c
     vid_rtg310x.c vid_f82c425.c vid_ti_cf62011.c vid_tvga.c vid_tgui9440.c
     vid_tkd8001_ramdac.c vid_att20c49x_ramdac.c vid_s3.c vid_s3_virge.c
     vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c
-    vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c)
+    vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c
+    vid_c&t_69000.c)
 
 if(MGA2)
     target_compile_definitions(vid PRIVATE USE_MGA2)

src/video/vid_table.c

@@ -207,6 +207,7 @@ video_cards[] = {
     { &s3_virge_357_pci_device                         },
     { &s3_diamond_stealth_4000_pci_device              },
     { &s3_trio3d2x_pci_device                          },
+    { &chips_69000_device                              },
     { &millennium_device                               },
 #if defined(DEV_BRANCH) && defined(USE_MGA2)
     { &millennium_ii_device                            },