Merge branch '86Box:master' into changeable_icon_set

2021-11-14 21:38:20 +01:00
parent a16e39bb62 3c7cdfa0f9
commit 88d22e950d
53 changed files with 3736 additions and 976 deletions
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -408,7 +408,7 @@ extern void	machine_at_award_common_init(const machine_t *);

 extern void	machine_at_sp4_common_init(const machine_t *model);

-extern int	machine_at_excalibur_pci_init(const machine_t *);
+extern int	machine_at_excaliburpci_init(const machine_t *);
 extern int	machine_at_p5mp3_init(const machine_t *);
 extern int	machine_at_dellxp60_init(const machine_t *);
 extern int	machine_at_opti560l_init(const machine_t *);
@@ -422,7 +422,7 @@ extern int	machine_at_excalibur_init(const machine_t *);

 extern int	machine_at_p5vl_init(const machine_t *);

-extern int	machine_at_excalibur_pci_2_init(const machine_t *);
+extern int	machine_at_excaliburpci2_init(const machine_t *);
 extern int	machine_at_p5sp4_init(const machine_t *);

 #ifdef EMU_DEVICE_H
@@ -437,7 +437,6 @@ extern int	machine_at_430nx_init(const machine_t *);
 extern int	machine_at_acerv30_init(const machine_t *);
 extern int	machine_at_apollo_init(const machine_t *);
 extern int	machine_at_exp8551_init(const machine_t *);
-extern int	machine_at_vectra54_init(const machine_t *);
 extern int	machine_at_zappa_init(const machine_t *);
 extern int	machine_at_powermatev_init(const machine_t *);
 extern int	machine_at_mb500n_init(const machine_t *);
@@ -450,13 +449,10 @@ extern int	machine_at_hot543_init(const machine_t *);
 extern int	machine_at_p54sp4_init(const machine_t *);
 extern int	machine_at_sq588_init(const machine_t *);

-#ifdef EMU_DEVICE_H
-#define at_vectra54_get_device	at_endeavor_get_device
-#endif

 /* m_at_socket7_3v.c */
 extern int	machine_at_p54tp4xe_init(const machine_t *);
-extern int	machine_at_mr586_init(const machine_t *);
+extern int	machine_at_p54tp4xe_mr_init(const machine_t *);
 extern int	machine_at_gw2katx_init(const machine_t *);
 extern int	machine_at_thor_init(const machine_t *);
 extern int	machine_at_mrthor_init(const machine_t *);
@@ -474,9 +470,11 @@ extern int	machine_at_p5vxb_init(const machine_t *);
 extern int	machine_at_gw2kte_init(const machine_t *);

 extern int	machine_at_ap5s_init(const machine_t *);
+extern int	machine_at_vectra54_init(const machine_t *);

 #ifdef EMU_DEVICE_H
 extern const device_t	*at_endeavor_get_device(void);
+#define at_vectra54_get_device	at_endeavor_get_device
 extern const device_t	*at_thor_get_device(void);
 #define at_mrthor_get_device	at_thor_get_device
 extern const device_t	*at_pb640_get_device(void);
@@ -488,7 +486,7 @@ extern int	machine_at_p55t2p4_init(const machine_t *);
 extern int	machine_at_m7shi_init(const machine_t *);
 extern int	machine_at_tc430hx_init(const machine_t *);
 extern int	machine_at_equium5200_init(const machine_t *);
-extern int	machine_at_pcv240_init(const machine_t *);
+extern int	machine_at_pcv90_init(const machine_t *);
 extern int	machine_at_p65up5_cp55t2d_init(const machine_t *);

 extern int	machine_at_ap5vm_init(const machine_t *);
@@ -546,7 +544,7 @@ extern int	machine_at_v60n_init(const machine_t *);
 extern int	machine_at_vs440fx_init(const machine_t *);
 extern int	machine_at_ap440fx_init(const machine_t *);
 extern int	machine_at_mb600n_init(const machine_t *);
-extern int	machine_at_8500ttc_init(const machine_t *);
+extern int	machine_at_8600ttc_init(const machine_t *);
 extern int	machine_at_m6mi_init(const machine_t *);
 #ifdef EMU_DEVICE_H
 extern void	machine_at_p65up5_common_init(const machine_t *, const device_t *northbridge);
@@ -570,7 +568,7 @@ extern int	machine_at_bf6_init(const machine_t *);
 extern int	machine_at_ax6bc_init(const machine_t *);
 extern int	machine_at_atc6310bxii_init(const machine_t *);
 extern int	machine_at_686bx_init(const machine_t *);
-extern int	machine_at_tsunamiatx_init(const machine_t *);
+extern int	machine_at_s1846_init(const machine_t *);
 extern int	machine_at_p6sba_init(const machine_t *);
 extern int	machine_at_ficka6130_init(const machine_t *);
 extern int	machine_at_p3v133_init(const machine_t *);
@@ -582,7 +580,11 @@ extern int	machine_at_borapro_init(const machine_t *);
 extern int	machine_at_ms6168_init(const machine_t *);

 #ifdef EMU_DEVICE_H
-extern const device_t 	*at_tsunamiatx_get_device(void);
+extern const device_t 	*at_s1846_get_device(void);
+#define at_s1857_get_device	at_s1846_get_device
+#define at_gt694va_get_device	at_s1846_get_device
+extern const device_t 	*at_ms6168_get_device(void);
+#define at_borapro_get_device	at_ms6168_get_device
 #endif

 /* m_at_slot2.c */
@@ -597,13 +599,13 @@ extern int	machine_at_cubx_init(const machine_t *);
 extern int	machine_at_atc7020bxii_init(const machine_t *);
 extern int	machine_at_ambx133_init(const machine_t *);
 extern int	machine_at_awo671r_init(const machine_t *);
-extern int	machine_at_63a_init(const machine_t *);
+extern int	machine_at_63a1_init(const machine_t *);
 extern int	machine_at_s370sba_init(const machine_t *);
 extern int	machine_at_apas3_init(const machine_t *);
 extern int	machine_at_gt694va_init(const machine_t *);
 extern int	machine_at_cuv4xls_init(const machine_t *);
 extern int	machine_at_6via90ap_init(const machine_t *);
-extern int	machine_at_trinity371_init(const machine_t *);
+extern int	machine_at_s1857_init(const machine_t *);
 extern int	machine_at_p6bap_init(const machine_t *);

 /* m_at_misc.c */
--- a/src/include/86box/snd_ac97.h
+++ b/src/include/86box/snd_ac97.h
@@ -18,14 +18,97 @@
 # define EMU_SND_AC97_H


+#define AC97_VENDOR_ID(f, s, t, dev)	((((f) & 0xff) << 24) | (((s) & 0xff) << 16) | (((t) & 0xff) << 8) | ((dev) & 0xff))
+
+/* Misc support bits (misc_flags). Most of these are not part of any
+   registers, but control enabling/disabling of registers and bits. */
+#define AC97_MASTER_6B	(1 << 0) /* register 02 bits [13,5] (ML5/MR5) */
+#define AC97_AUXOUT	(1 << 1) /* register 04 */
+#define AC97_AUXOUT_6B	(1 << 2) /* register 04 bits [13,5] (ML5/MR5) */
+#define AC97_MONOOUT	(1 << 3) /* register 06 */
+#define AC97_MONOOUT_6B	(1 << 4) /* register 06 bit 5 (MM5) */
+#define AC97_PCBEEP	(1 << 5) /* register 0A */
+#define AC97_PCBEEP_GEN	(1 << 6) /* register 0A bits [12:5] (F[7:0]) */
+#define AC97_PHONE	(1 << 9) /* register 0C */
+#define AC97_VIDEO	(1 << 10) /* register 14 */
+#define AC97_AUXIN	(1 << 11) /* register 16 */
+#define AC97_POP	(1 << 15) /* register 20 bit 15 (POP) - definition shared with General Purpose bits */
+#define AC97_MS		(1 << 8) /* register 20 bit 8 (MS) - definition shared with General Purpose bits */
+#define AC97_LPBK	(1 << 7) /* register 20 bit 7 (LPBK) - definition shared with General Purpose bits */
+#define AC97_DSA	(1 << 12) /* register 28 bits [5:4] (DSA[1:0]) */
+#define AC97_LFE_6B	(1 << 13) /* register 36 bit 13 (LFE5) */
+#define AC97_CENTER_6B	(1 << 14) /* register 36 bit 5 (CNT5) */
+#define AC97_SURR_6B	(1 << 16) /* register 38 bits [13,5] (LSR5/RSR5) */
+
+/* Reset bits (reset_flags), register 00. */
+#define AC97_MICPCM	(1 << 0)
+#define AC97_MODEMLINE	(1 << 1)
+#define AC97_TONECTL	(1 << 2)
+#define AC97_SIMSTEREO	(1 << 3)
+#define AC97_HPOUT	(1 << 4)
+#define AC97_LOUDNESS	(1 << 5)
+#define AC97_DAC_18B	(1 << 6)
+#define AC97_DAC_20B	(1 << 7)
+#define AC97_ADC_18B	(1 << 8)
+#define AC97_ADC_20B	(1 << 9)
+#define AC97_3D_SHIFT	10
+
+/* Extended Audio ID bits (extid_flags), register 28. */
+#define AC97_VRA	(1 << 0)
+#define AC97_DRA	(1 << 1)
+#define AC97_SPDIF	(1 << 2)
+#define AC97_VRM	(1 << 3)
+#define AC97_CDAC	(1 << 6)
+#define AC97_SDAC	(1 << 7)
+#define AC97_LDAC	(1 << 8)
+#define AC97_AMAP	(1 << 9)
+#define AC97_REV_2_1	(0 << 10)
+#define AC97_REV_2_2	(1 << 10)
+#define AC97_REV_2_3	(2 << 10)
+#define AC97_REV_MASK	(3 << 10)
+
+/* Volume bits. */
+#define AC97_MUTE	(1 << 15)
+#define AC97_MUTE_L	(1 << 15)
+#define AC97_MUTE_R	(1 << 7)
+
+/* General Purpose bits, register 20. */
+/* POP already defined */
+#define AC97_ST		(1 << 14)
+#define AC97_3D		(1 << 13)
+#define AC97_LD		(1 << 12)
+#define AC97_DRSS_MASK	(3 << 10)
+#define AC97_MIX	(1 << 9)
+/* MS already defined */
+/* LPBK already defined */
+
+/* Extended Audio Status/Control bits, register 2A. */
+#define AC97_SPSA_SHIFT	4
+#define AC97_SPSA_MASK	3
+#define AC97_MADC	(1 << 9)
+#define AC97_SPCV	(1 << 10)
+#define AC97_PRI	(1 << 11)
+#define AC97_PRJ	(1 << 12)
+#define AC97_PRK	(1 << 13)
+#define AC97_PRL	(1 << 14)
+
+
 typedef struct {
-    uint32_t	vendor_id;
-    uint8_t	codec_id, regs[128];
+    const uint16_t index, value, write_mask;
+} ac97_vendor_reg_t;
+
+typedef struct {
+    uint32_t	vendor_id, max_rate, misc_flags;
+    uint16_t	reset_flags, extid_flags,
+		powerdown_mask, regs[64];
+    uint8_t	codec_id, vendor_reg_page_max;
+    const ac97_vendor_reg_t *vendor_regs;
+    uint16_t	*vendor_reg_pages;
 } ac97_codec_t;


-extern uint8_t	ac97_codec_read(ac97_codec_t *dev, uint8_t reg);
-extern void	ac97_codec_write(ac97_codec_t *dev, uint8_t reg, uint8_t val);
+extern uint16_t	ac97_codec_readw(ac97_codec_t *dev, uint8_t reg);
+extern void	ac97_codec_writew(ac97_codec_t *dev, uint8_t reg, uint16_t val);
 extern void	ac97_codec_reset(void *priv);
 extern void	ac97_codec_getattn(void *priv, uint8_t reg, int *l, int *r);
 extern uint32_t	ac97_codec_getrate(void *priv, uint8_t reg);
--- a/src/include/86box/version.h.in
+++ b/src/include/86box/version.h.in
@@ -13,19 +13,43 @@
 *		Copyright 2020 Miran Grca.
 */

+#define _LSTR(s) L ## s
+#define LSTR(s) _LSTR(s)
+
 /* Version info. */
 #define EMU_NAME	"@CMAKE_PROJECT_NAME@"
-#define EMU_NAME_W	L"@CMAKE_PROJECT_NAME@"
+#define EMU_NAME_W	LSTR(EMU_NAME)

 #define EMU_VERSION	"@CMAKE_PROJECT_VERSION@"
-#define EMU_VERSION_W	L"@CMAKE_PROJECT_VERSION@"
-#define EMU_VERSION_EX	"@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@0"
+#define EMU_VERSION_W	LSTR(EMU_VERSION)
+#define EMU_VERSION_EX	"@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@@CMAKE_PROJECT_VERSION_PATCH@"
 #define EMU_VERSION_MAJ	@CMAKE_PROJECT_VERSION_MAJOR@
 #define EMU_VERSION_MIN	@CMAKE_PROJECT_VERSION_MINOR@
+#define EMU_VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@

-#define COPYRIGHT_YEAR	"2020"
+#cmakedefine EMU_BUILD	"@EMU_BUILD@"
+#define EMU_BUILD_NUM	@EMU_BUILD_NUM@
+#cmakedefine EMU_GIT_HASH	"@EMU_GIT_HASH@"
+
+#ifdef EMU_BUILD
+# define EMU_BUILD_W		LSTR(EMU_BUILD)
+# define EMU_VERSION_FULL	EMU_VERSION " [" EMU_BUILD "]"
+# define EMU_VERSION_FULL_W	EMU_VERSION_W L" [" EMU_BUILD_W L"]"
+#else
+# define EMU_VERSION_FULL	EMU_VERSION
+# define EMU_VERSION_FULL_W	EMU_VERSION_W
+#endif
+#ifdef EMU_GIT_HASH
+# define EMU_GIT_HASH_W		LSTR(EMU_GIT_HASH)
+#endif
+
+#define COPYRIGHT_YEAR	"@EMU_COPYRIGHT_YEAR@"

 /* Web URL info. */
-#define EMU_SITE	L"@CMAKE_PROJECT_HOMEPAGE_URL@"
+#define EMU_SITE	L"86box.net"
 #define EMU_ROMS_URL	L"https://github.com/86Box/roms/releases/latest"
-#define EMU_DOCS_URL	L"https://86box.readthedocs.io"
+#ifdef RELEASE_BUILD
+# define EMU_DOCS_URL	L"https://86box.readthedocs.io/en/v@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@/"
+#else
+# define EMU_DOCS_URL	L"https://86box.readthedocs.io"
+#endif
--- a/src/include/86box/vid_voodoo_codegen_x86.h
+++ b/src/include/86box/vid_voodoo_codegen_x86.h
@@ -3361,12 +3361,6 @@ voodoo_recomp++;
 void voodoo_codegen_init(voodoo_t *voodoo)
 {
        int c;
-#if defined(__linux__) || defined(__APPLE__)
-	void *start;
-	size_t len;
-	long pagesize = sysconf(_SC_PAGESIZE);
-	long pagemask = ~(pagesize - 1);
-#endif

        voodoo->codegen_data = plat_mmap(sizeof(voodoo_x86_data_t) * BLOCK_NUM*4, 1);

--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -194,6 +194,9 @@ extern void	svga_dump_vram(void);

 extern uint32_t	video_color_transform(uint32_t color);

+extern void	agpgart_set_aperture(void *handle, uint32_t base, uint32_t size, int enable);
+extern void	agpgart_set_gart(void *handle, uint32_t base);
+
 #ifdef __cplusplus
 }
 #endif
@@ -432,6 +435,9 @@ extern const device_t velocity_100_agp_device;

 /* Wyse 700 */
 extern const device_t wy700_device;
+
+/* AGP GART */
+extern const device_t agpgart_device;
 #endif