Merge branch '86Box:master' into unix_ods

src/include/86box/hdc.h

@@ -30,6 +30,7 @@
 #define HDC_MAX      4
 
 extern int hdc_current[HDC_MAX];
+extern int hdc_onboard_enabled;
 
 extern const device_t st506_xt_xebec_device;              /* st506_xt_xebec */
 extern const device_t st506_xt_wdxt_gen_device;           /* st506_xt_wdxt_gen */

src/include/86box/snd_ad1848.h

@@ -78,6 +78,8 @@ typedef struct ad1848_t {
     pc_timer_t timer_count;
     uint64_t   timer_latch;
 
+    pc_timer_t cs4231a_irq_timer;
+
     int16_t buffer[SOUNDBUFLEN * 2];
     int     pos;
 

src/include/86box/sound.h

@@ -238,6 +238,9 @@ extern const device_t tndy_device;
 extern const device_t wss_device;
 extern const device_t ncr_business_audio_device;
 
+/* Yamaha YMF-7xx */
+extern const device_t ymf701_device;
+
 #ifdef USE_LIBSERIALPORT
 /* External Audio device OPL2Board (Host Connected hardware)*/
 extern const device_t opl2board_device;

src/include/86box/vid_clockgen_icd2061.h

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ *          ICD2061 clock generator emulation.
+ *          Also emulates the ICS9161 which is the same as the ICD2016,
+ *          but without the need for tuning (which is irrelevant in
+ *          emulation anyway).
+ *
+ *          Used by ET4000w32/p (Diamond Stealth 32) and the S3
+ *          Vision964 family.
+ *
+ *
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2018 Miran Grca.
+ */
+#ifndef VIDEO_CLOCKGEN_ICD2061_H
+#define VIDEO_CLOCKGEN_ICD2061_H
+
+typedef struct icd2061_t {
+    float freq[3];
+    float ref_clock;
+
+    int      count;
+    int      bit_count;
+    int      unlocked;
+    int      state;
+    uint32_t data;
+    uint32_t ctrl;
+} icd2061_t;
+
+#endif // VIDEO_CLOCKGEN_ICD2061_H

src/include/86box/vid_svga.h

@@ -142,6 +142,9 @@ typedef struct svga_t {
     int start_retrace_latch;
     int vga_mode;
     int half_pixel;
+    int clock_multiplier;
+    int true_color_bypass;
+    int multiplexing_rate;
 
     /*The three variables below allow us to implement memory maps like that seen on a 1MB Trio64 :
       0MB-1MB - VRAM
@@ -450,7 +453,7 @@ extern void    ibm_rgb528_ramdac_set_ref_clock(void *priv, svga_t *svga, float r
 
 extern void  icd2061_write(void *priv, int val);
 extern float icd2061_getclock(int clock, void *priv);
-extern void  icd2061_set_ref_clock(void *priv, svga_t *svga, float ref_clock);
+extern void  icd2061_set_ref_clock(void *priv, float ref_clock);
 
 /* The code is the same, the #define's are so that the correct name can be used. */
 #    define ics9161_write    icd2061_write