Merge branch 'master' into ich2-up

src/include/86box/86box.h

@@ -135,7 +135,8 @@ extern int	is_pentium;			/* TODO: Move back to cpu/cpu.h when it's figured out,
 							 how to remove that hack from the ET4000/W32p. */
 extern int	fixed_size_x, fixed_size_y;
 extern double mouse_sensitivity; /* (C) Mouse sensitivity scale */
-
+extern int	pit_mode;			/* (C) force setting PIT mode */
+extern int	fm_driver;			/* (C) select FM sound driver */
 
 extern char	exe_path[2048];			/* path (dir) of executable */
 extern char	usr_path[1024];			/* path (dir) of user data */

src/include/86box/keyboard.h

@@ -178,6 +178,7 @@ extern const device_t	keyboard_ps2_pci_device;
 extern const device_t	keyboard_ps2_ami_pci_device;
 extern const device_t	keyboard_ps2_intel_ami_pci_device;
 extern const device_t	keyboard_ps2_acer_pci_device;
+extern const device_t	keyboard_ps2_ali_pci_device;
 #endif
 
 extern void	keyboard_init(void);

src/include/86box/net_wd8003.h

@@ -50,7 +50,8 @@ enum {
     WD8003EB,			/* WD8003EB  :  8-bit ISA, 5x3 interface chip */
     WD8013EBT,			/* WD8013EBT : 16-bit ISA, no  interface chip */
     WD8003ETA,			/* WD8003ET/A: 16-bit MCA, no  interface chip */
-    WD8003EA			/* WD8003E/A : 16-bit MCA, 5x3 interface chip */
+    WD8003EA,			/* WD8003E/A : 16-bit MCA, 5x3 interface chip */
+    WD8013EPA
 };
 
 extern const device_t 	wd8003e_device;
@@ -58,5 +59,6 @@ extern const device_t 	wd8003eb_device;
 extern const device_t 	wd8013ebt_device;
 extern const device_t 	wd8003eta_device;
 extern const device_t 	wd8003ea_device;
+extern const device_t 	wd8013epa_device;
 
 #endif	/*NET_WD8003_H*/

src/include/86box/pit.h

@@ -58,9 +58,33 @@ typedef struct PIT {
     uint8_t	ctrl;
 } pit_t;
 
+enum {
+    PIT_8253 = 0,
+    PIT_8254,
+    PIT_8253_FAST,
+    PIT_8254_FAST
+};
+
+typedef struct {
+    uint8_t (*read)(uint16_t addr, void *priv);
+    void (*write)(uint16_t addr, uint8_t val, void *priv);
+    /* Gets a counter's count. */
+    uint16_t (*get_count)(void *data, int counter_id);
+    /* Sets a counter's GATE input. */
+    void (*set_gate)(void *data, int counter_id, int gate);
+    /* Sets if a counter's CLOCK input is from the timer or not - used by PCjr. */
+    void(*set_using_timer)(void *data, int counter_id, int using_timer);
+    /* Sets a counter's OUT output handler. */
+    void (*set_out_func)(void *data, int counter_id, void (*func)(int new_out, int old_out));
+    /* Sets a counter's load count handler. */
+    void  (*set_load_func)(void *data, int counter_id, void (*func)(uint8_t new_m, int new_count));
+    void (*ctr_clock)(void *data, int counter_id);
+    void *data;
+} pit_intf_t;
+
+extern pit_intf_t pit_devs[2];
+extern const pit_intf_t pit_classic_intf;
 
-extern pit_t	*pit,
-		*pit2;
 
 extern double	SYSCLK, PCICLK, AGPCLK;
 
@@ -75,26 +99,13 @@ extern uint64_t	PITCONST, ISACONST,
 
 extern int	refresh_at_enable;
 
-
-/* Gets a counter's count. */
-extern uint16_t	pit_ctr_get_count(ctr_t *ctr);
-/* Sets a counter's load count handler. */
-extern void	pit_ctr_set_load_func(ctr_t *ctr, void (*func)(uint8_t new_m, int new_count));
-/* Sets a counter's OUT output handler. */
-extern void	pit_ctr_set_out_func(ctr_t *ctr, void (*func)(int new_out, int old_out));
-/* Sets a counter's GATE input. */
-extern void	pit_ctr_set_gate(ctr_t *ctr, int gate);
 /* Sets a counter's CLOCK input. */
 extern void	pit_ctr_set_clock(ctr_t *ctr, int clock);
-/* Sets if a counter's CLOCK input is from the timer or not - used by PCjr. */
-extern void	pit_ctr_set_using_timer(ctr_t *ctr, int using_timer);
 
 extern pit_t *	pit_common_init(int type, void (*out0)(int new_out, int old_out), void (*out1)(int new_out, int old_out));
-extern pit_t *	pit_ps2_init(void);
+extern pit_t *	pit_ps2_init(int type);
 extern void	pit_reset(pit_t *dev);
 
-extern void	pit_irq0_timer(int new_out, int old_out);
-extern void	pit_irq0_timer_pcjr(int new_out, int old_out);
 extern void	pit_irq0_timer_ps2(int new_out, int old_out);
 
 extern void	pit_refresh_timer_xt(int new_out, int old_out);

src/include/86box/pit_fast.h

@@ -0,0 +1,72 @@
+/*
+ * 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.
+ *
+ *		Header of the implementation of the Intel 8253/8254
+ *		Programmable Interval Timer.
+ *
+ *
+ *
+ * Author:	Miran Grca, <mgrca8@gmail.com>
+ *		Copyright 2019,2020 Miran Grca.
+ */
+
+#ifndef EMU_PIT_FAST_H
+#define EMU_PIT_FAST_H
+
+typedef struct {
+    uint8_t m, ctrl,
+        read_status, latch, bcd;
+
+    uint16_t rl;
+
+    int rm, wm, gate, out,
+        newcount, clock, using_timer, latched,
+        do_read_status;
+    int enabled;
+    int disabled;
+    int initial;
+    int thit;
+    int running;
+    int rereadlatch;
+
+    union {
+        int count;
+        struct {
+            int units     : 4;
+            int tens      : 4;
+            int hundreds  : 4;
+            int thousands : 4;
+            int myriads   : 4;
+        };
+    };
+
+    uint32_t   l;
+    pc_timer_t timer;
+
+    void (*load_func)(uint8_t new_m, int new_count);
+    void (*out_func)(int new_out, int old_out);
+} ctrf_t;
+
+typedef struct {
+    int    flags;
+    ctrf_t counters[3];
+
+    uint8_t ctrl;
+} pitf_t;
+
+extern const pit_intf_t pit_fast_intf;
+
+#ifdef EMU_DEVICE_H
+extern const device_t i8253_fast_device;
+extern const device_t i8254_fast_device;
+extern const device_t i8254_sec_fast_device;
+extern const device_t i8254_ext_io_fast_device;
+extern const device_t i8254_ps2_fast_device;
+#endif
+
+#endif	/*EMU_PIT_FAST_H*/

src/include/86box/snd_opl.h

@@ -17,38 +17,40 @@
 #ifndef SOUND_OPL_H
 #define SOUND_OPL_H
 
-typedef void (*tmrfunc)(void *priv, int timer, uint64_t period);
+enum fm_type {
+    FM_YM3812 = 0,
+    FM_YMF262,
+    FM_YMF289B,
+    FM_MAX
+};
+
+enum fm_driver {
+    FM_DRV_NUKED = 0,
+    FM_DRV_YMFM,
+    FM_DRV_MAX
+};
 
-/* Define an OPLx chip. */
 typedef struct {
-#ifdef SOUND_OPL_NUKED_H
-    nuked_t *opl;
-#else
-    void *opl;
+    uint8_t   (*read)(uint16_t port, void *priv);
+    void      (*write)(uint16_t port, uint8_t val, void *priv);
+    int32_t * (*update)(void *priv);
+    void (*reset_buffer)(void *priv);
+    void      (*set_do_cycles)(void *priv, int8_t do_cycles);
+    void      *priv;
+} fm_drv_t;
+
+extern uint8_t fm_driver_get(int chip_id, fm_drv_t *drv);
+
+extern const fm_drv_t nuked_opl_drv;
+extern const fm_drv_t ymfm_drv;
+
+#ifdef EMU_DEVICE_H
+extern const device_t ym3812_nuked_device;
+extern const device_t ymf262_nuked_device;
+
+extern const device_t ym3812_ymfm_device;
+extern const device_t ymf262_ymfm_device;
+extern const device_t ymf289b_ymfm_device;
 #endif
-    int8_t flags, pad;
-
-    uint16_t port;
-    uint8_t  status, timer_ctrl;
-    uint16_t timer_count[2],
-        timer_cur_count[2];
-
-    pc_timer_t timers[2];
-
-    int     pos;
-    int32_t buffer[SOUNDBUFLEN * 2];
-} opl_t;
-
-extern void opl_set_do_cycles(opl_t *dev, int8_t do_cycles);
-
-extern uint8_t opl2_read(uint16_t port, void *);
-extern void    opl2_write(uint16_t port, uint8_t val, void *);
-extern void    opl2_init(opl_t *);
-extern void    opl2_update(opl_t *);
-
-extern uint8_t opl3_read(uint16_t port, void *);
-extern void    opl3_write(uint16_t port, uint8_t val, void *);
-extern void    opl3_init(opl_t *);
-extern void    opl3_update(opl_t *);
 
 #endif /*SOUND_OPL_H*/

src/include/86box/snd_opl_nuked.h

@@ -20,15 +20,5 @@
 #ifndef SOUND_OPL_NUKED_H
 #define SOUND_OPL_NUKED_H
 
-extern void *nuked_init(uint32_t sample_rate);
-extern void  nuked_close(void *);
-
-extern uint16_t nuked_write_addr(void *, uint16_t port, uint8_t val);
-extern void     nuked_write_reg(void *, uint16_t reg, uint8_t v);
-extern void     nuked_write_reg_buffered(void *, uint16_t reg, uint8_t v);
-
-extern void nuked_generate(void *, int32_t *buf);
-extern void nuked_generate_resampled(void *, int32_t *buf);
-extern void nuked_generate_stream(void *, int32_t *sndptr, uint32_t num);
 
 #endif /*SOUND_OPL_NUKED_H*/

src/include/86box/snd_sb.h

@@ -129,7 +129,7 @@ typedef struct sb_t {
         opl_enabled,
         mixer_enabled;
     cms_t cms;
-    opl_t opl,
+    fm_drv_t opl,
         opl2;
     sb_dsp_t dsp;
     union {

src/include/86box/sound.h

@@ -120,6 +120,7 @@ extern const device_t sb_16_device;
 extern const device_t sb_16_pnp_device;
 extern const device_t sb_16_compat_device;
 extern const device_t sb_16_compat_nompu_device;
+extern const device_t sb_16_reply_mca_device;
 extern const device_t sb_32_pnp_device;
 extern const device_t sb_awe32_device;
 extern const device_t sb_awe32_pnp_device;

src/include/86box/timer.h

@@ -56,6 +56,10 @@ typedef struct pc_timer_t
     struct	pc_timer_t *prev, *next;
 } pc_timer_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*Timestamp of nearest enabled timer. CPU emulation must call timer_process()
   when TSC matches or exceeds this.*/
 extern uint32_t	timer_target;
@@ -237,4 +241,8 @@ timer_process_inline(void)
     timer_target = timer_head->ts.ts32.integer;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*_TIMER_H_*/