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

src/include/86box/scsi_buslogic.h

@@ -20,12 +20,14 @@
 # define SCSI_BUSLOGIC_H
 
 
-extern const device_t buslogic_542b_1991_device;
-extern const device_t buslogic_device;
+extern const device_t buslogic_542b_device;
 extern const device_t buslogic_545s_device;
+extern const device_t buslogic_542bh_device;
+extern const device_t buslogic_545c_device;
 extern const device_t buslogic_640a_device;
 extern const device_t buslogic_445s_device;
-extern const device_t buslogic_pci_device;
+extern const device_t buslogic_445c_device;
+extern const device_t buslogic_958d_pci_device;
 
 extern	void BuslogicDeviceReset(void *p);
   

src/include/86box/sound.h

@@ -99,8 +99,12 @@ extern const device_t gus_device;
 extern const device_t pas16_device;
 #endif
 
+/* IBM PS/1 Audio Card */
+extern const device_t ps1snd_device;
+
 /* Tandy PSSJ */
 extern const device_t pssj_device;
+extern const device_t pssj_isa_device;
 
 /* Creative Labs Sound Blaster */
 extern const device_t sb_1_device;

src/include/86box/vid_cga.h

@@ -15,6 +15,8 @@
  *		Copyright 2008-2018 Sarah Walker.
  *		Copyright 2016-2018 Miran Grca.
  */
+#ifndef VIDEO_CGA_H
+# define VIDEO_CGA_H
 
 typedef struct cga_t
 {
@@ -65,3 +67,5 @@ void    cga_poll(void *p);
 extern const device_config_t cga_config[];
 extern const device_t cga_device;
 #endif
+
+#endif	/*VIDEO_CGA_H*/

src/include/86box/vid_cga_comp.h

@@ -16,6 +16,8 @@
  *		Copyright 2015-2018 reenigne.
  *		Copyright 2015-2018 Miran Grca.
  */
+#ifndef VIDEO_CGA_COMP_H
+# define VIDEO_CGA_COMP_H
 
 #define Bit8u uint8_t
 #define Bit32u uint32_t
@@ -25,3 +27,5 @@
 void update_cga16_color(uint8_t cgamode);
 void cga_comp_init(int revision);
 Bit32u * Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks/*, bool doublewidth*/, Bit32u *TempLine);
+
+#endif	/*VIDEO_CGA_COMP_H*/

src/include/86box/vid_hercules.h

@@ -0,0 +1,61 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation of the Hercules graphics cards.
+ *
+ *
+ *
+ * Author:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *		Copyright 2008-2019 Sarah Walker.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2021 Jasmine Iwanek.
+ */
+#ifndef VIDEO_HERCULES_H
+# define VIDEO_HERCULES_H
+
+typedef struct {
+    mem_mapping_t	mapping;
+
+    uint8_t	crtc[32], charbuffer[4096];
+    int		crtcreg;
+
+    uint8_t	ctrl,
+		ctrl2,
+		stat;
+
+    uint64_t	dispontime,
+		dispofftime;
+    pc_timer_t	timer;
+
+    int		firstline,
+		lastline;
+
+    int		linepos,
+		displine;
+    int		vc,
+		sc;
+    uint16_t	ma,
+		maback;
+    int		con, coff,
+		cursoron;
+    int		dispon,
+		blink;
+    int	vsynctime;
+    int		vadj;
+
+    int		lp_ff;
+
+    int		cols[256][2][2];
+
+    uint8_t	*vram;
+} hercules_t;
+
+static void *hercules_init(const device_t *info);
+
+#endif	/*VIDEO_HERCULES_H*/

src/include/86box/vid_svga.h

@@ -16,6 +16,8 @@
  *		Copyright 2008-2020 Sarah Walker.
  *		Copyright 2016-2020 Miran Grca.
  */
+#ifndef VIDEO_SVGA_H
+# define VIDEO_SVGA_H
 
 
 #define FLAG_EXTRA_BANKS	1
@@ -274,6 +276,7 @@ extern void tvp3026_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, voi
 extern uint8_t tvp3026_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga);
 extern void	tvp3026_recalctimings(void *p, svga_t *svga);
 extern void	tvp3026_hwcursor_draw(svga_t *svga, int displine);
+extern float	tvp3026_getclock(int clock, void *p);
 
 #ifdef EMU_DEVICE_H
 extern const device_t ati68860_ramdac_device;
@@ -305,3 +308,5 @@ extern const device_t tseng_ics5301_ramdac_device;
 extern const device_t tseng_ics5341_ramdac_device;
 extern const device_t tvp3026_ramdac_device;
 #endif
+
+#endif	/*VIDEO_SVGA_H*/

src/include/86box/vid_vga.h

@@ -0,0 +1,34 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation of the IBM MDA + VGA graphics cards.
+ *
+ *
+ *
+ * Author:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *		Copyright 2008-2018 Sarah Walker.
+ *		Copyright 2016-2018 Miran Grca.
+ *		Copyright 2021 Jasmine Iwanek.
+ */
+#ifndef VIDEO_VGA_H
+# define VIDEO_VGA_H
+
+typedef struct vga_t
+{
+        svga_t svga;
+        
+        rom_t bios_rom;
+} vga_t;
+
+static video_timings_t timing_vga	   = {VIDEO_ISA, 8, 16, 32, 8, 16, 32};
+
+void vga_out(uint16_t addr, uint8_t val, void *p);
+uint8_t vga_in(uint16_t addr, void *p);
+
+#endif	/*VIDEO_VGA_H*/

src/include/86box/video.h

@@ -348,6 +348,7 @@ extern const device_t s3_diamond_stealth_vram_isa_device;
 extern const device_t s3_ami_86c924_isa_device;
 extern const device_t s3_metheus_86c928_isa_device;
 extern const device_t s3_metheus_86c928_vlb_device;
+extern const device_t s3_spea_mercury_lite_86c928_pci_device;
 extern const device_t s3_spea_mirage_86c801_isa_device;
 extern const device_t s3_spea_mirage_86c805_vlb_device;
 extern const device_t s3_mirocrystal_8s_805_vlb_device;
@@ -394,6 +395,7 @@ extern const device_t s3_trio64v2_dx_onboard_pci_device;
 extern const device_t s3_virge_325_pci_device;
 extern const device_t s3_diamond_stealth_2000_pci_device;
 extern const device_t s3_diamond_stealth_3000_pci_device;
+extern const device_t s3_stb_velocity_3d_pci_device;
 extern const device_t s3_virge_375_pci_device;
 extern const device_t s3_diamond_stealth_2000pro_pci_device;
 extern const device_t s3_virge_385_pci_device;