Merge branch 'master' into translation_hu-HU

2021-11-14 00:03:36 +01:00
parent 7651f4be6d 11a106b734
commit 6f0da19369
138 changed files with 13035 additions and 4519 deletions
--- a/src/include/86box/acpi.h
+++ b/src/include/86box/acpi.h
@@ -61,7 +61,7 @@ typedef struct
 {
    uint8_t		acpitst, auxen, auxsts, plvl2, plvl3,
 			smicmd, gpio_dir,
-			gpio_val, muxcntrl, pad,
+			gpio_val, muxcntrl, ali_soft_smi,
 			timer32, smireg,
 			gpireg[3], gporeg[4],
 			extiotrapsts, extiotrapen;
@@ -92,7 +92,8 @@ typedef struct
    uint16_t		io_base, aux_io_base;
    int			vendor,
 			slot, irq_mode,
-			irq_pin, irq_line;
+			irq_pin, irq_line,
+			mirq_is_level;
    pc_timer_t		timer, resume_timer;
    nvr_t		*nvr;
    apm_t		*apm;
@@ -114,7 +115,7 @@ extern const device_t	acpi_via_596b_device;

 /* Functions */
 extern void		acpi_update_irq(acpi_t *dev);
-extern void		acpi_raise_smi(acpi_t *dev);
+extern void		acpi_raise_smi(void *priv, int do_smi);
 extern void		acpi_update_io_mapping(acpi_t *dev, uint32_t base, int chipset_en);
 extern void		acpi_update_aux_io_mapping(acpi_t *dev, uint32_t base, int chipset_en);
 extern void		acpi_init_gporeg(acpi_t *dev, uint8_t val0, uint8_t val1, uint8_t val2, uint8_t val3);
@@ -123,9 +124,12 @@ extern void		acpi_set_slot(acpi_t *dev, int slot);
 extern void		acpi_set_irq_mode(acpi_t *dev, int irq_mode);
 extern void		acpi_set_irq_pin(acpi_t *dev, int irq_pin);
 extern void		acpi_set_irq_line(acpi_t *dev, int irq_line);
+extern void		acpi_set_mirq_is_level(acpi_t *dev, int mirq_is_level);
 extern void		acpi_set_gpireg2_default(acpi_t *dev, uint8_t gpireg2_default);
 extern void		acpi_set_nvr(acpi_t *dev, nvr_t *nvr);
 extern void		acpi_set_trap_update(acpi_t *dev, void (*update)(void *priv), void *priv);
+extern uint8_t		acpi_ali_soft_smi_status_read(acpi_t *dev);
+extern void		acpi_ali_soft_smi_status_write(acpi_t *dev, uint8_t soft_smi);

 #ifdef __cplusplus
 }
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -24,18 +24,22 @@ extern const device_t	acc2168_device;
 /* ALi */
 extern const device_t	ali1217_device;
 extern const device_t	ali1429_device;
+extern const device_t	ali1429g_device;
 extern const device_t	ali1489_device;
-#if defined(DEV_BRANCH) && defined(USE_M154X)
 extern const device_t	ali1531_device;
+extern const device_t	ali1541_device;
 extern const device_t	ali1543_device;
-#endif
-#if defined(DEV_BRANCH) && defined(USE_M6117)
+extern const device_t	ali1543c_device;
+extern const device_t	ali1621_device;
 extern const device_t	ali6117d_device;
-#endif

 /* AMD */
 extern const device_t	amd640_device;

+/* Contaq/Cypress */
+extern const device_t	contaq_82c596a_device;
+extern const device_t	contaq_82c597_device;
+
 /* C&T */
 extern const device_t	ct_82c100_device;
 extern const device_t	neat_device;
@@ -45,9 +49,6 @@ extern const device_t	scat_sx_device;
 extern const device_t	cs8230_device;
 extern const device_t   cs4031_device;

-/* ETEQ */
-extern const device_t   et6000_device;
-
 /* G2 */
 extern const device_t   gc100_device;
 extern const device_t   gc100a_device;
@@ -58,9 +59,13 @@ extern const device_t	headland_ht18a_device;
 extern const device_t	headland_ht18b_device;
 extern const device_t	headland_ht18c_device;

+/* IMS */
+extern const device_t	ims8848_device;
+
 /* Intel */
 extern const device_t   intel_82335_device;
 extern const device_t	i420ex_device;
+extern const device_t	i420ex_ide_device;
 extern const device_t	i420tx_device;
 extern const device_t	i420zx_device;
 extern const device_t	i430lx_device;
@@ -78,10 +83,7 @@ extern const device_t	i440bx_device;
 extern const device_t	i440bx_no_agp_device;
 extern const device_t	i440gx_device;
 extern const device_t	i440zx_device;
-
-#if defined(DEV_BRANCH) && defined(USE_I450KX)
 extern const device_t	i450kx_device;
-#endif

 extern const device_t	sio_device;
 extern const device_t	sio_zb_device;
@@ -128,11 +130,10 @@ extern const device_t	stpc_serial_device;
 extern const device_t	stpc_lpt_device;

 /* UMC */
-extern const device_t	umc_hb4_device;
-extern const device_t	umc_8890_device;
-
+extern const device_t	umc_um82c49x_device;
 extern const device_t	umc_8886f_device;
 extern const device_t	umc_8886af_device;
+extern const device_t	umc_hb4_device;

 /* VIA */
 extern const device_t   via_vt82c49x_device;
@@ -155,6 +156,7 @@ extern const device_t	via_vt8231_device;

 /* VLSI */
 extern const device_t   vl82c480_device;
+extern const device_t   vl82c486_device;
 extern const device_t   vlsi_scamp_device;

 /* WD */
@@ -162,7 +164,7 @@ extern const device_t	wd76c10_device;

 /* Miscellaneous Hardware */
 extern const device_t   phoenix_486_jumper_device;
-extern const device_t	vpc2007_device;
+extern const device_t   phoenix_486_jumper_pci_device;

 #if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
 extern const device_t   olivetti_eva_device;
--- a/src/include/86box/config.h
+++ b/src/include/86box/config.h
@@ -110,9 +110,9 @@ typedef struct {
    /* Ports category */
    char		parallel_devices[3][32];	/* LPT device names */
 #ifdef USE_SERIAL_DEVICES
-    char		serial_devices[2][32];		/* Serial device names */
+    char		serial_devices[4][32];		/* Serial device names */
 #endif
-    int			serial_enabled[2],		/* Serial ports 1 and 2 enabled */
+    int			serial_enabled[4],		/* Serial ports 1 and 2 enabled */
 			parallel_enabled[3];		/* LPT1, LPT2, LPT3 enabled */

    /* Other peripherals category */
--- a/src/include/86box/hdc.h
+++ b/src/include/86box/hdc.h
@@ -56,6 +56,9 @@ extern const device_t	ide_cmd640_vlb_178_device;		/* CMD PCI-640B VLB (Port 178h
 extern const device_t	ide_cmd640_pci_device;			/* CMD PCI-640B PCI */
 extern const device_t	ide_cmd640_pci_legacy_only_device;	/* CMD PCI-640B PCI (Legacy Mode Only) */
 extern const device_t	ide_cmd640_pci_single_channel_device;	/* CMD PCI-640B PCI (Only primary channel) */
+extern const device_t	ide_cmd646_device;			/* CMD PCI-646 */
+extern const device_t	ide_cmd646_legacy_only_device;		/* CMD PCI-646 (Legacy Mode Only) */
+extern const device_t	ide_cmd646_single_channel_device;	/* CMD PCI-646 (Only primary channel) */

 extern const device_t	ide_opti611_vlb_device;		/* OPTi 82c611/611A VLB */

--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -153,5 +153,8 @@ extern int	(*ide_bus_master_dma)(int channel, uint8_t *data, int transfer_length
 extern void	(*ide_bus_master_set_irq)(int channel, void *priv);
 extern void	*ide_bus_master_priv[2];

+extern uint8_t	ide_read_ali_75(void);
+extern uint8_t	ide_read_ali_76(void);
+

 #endif	/*EMU_IDE_H*/
--- a/src/include/86box/hdc_ide_sff8038i.h
+++ b/src/include/86box/hdc_ide_sff8038i.h
@@ -19,14 +19,16 @@
 typedef struct
 {
    uint8_t	command, status,
-		ptr0, enabled;
-    uint16_t	base, pad;
+		ptr0, enabled,
+		dma_mode, pad,
+		pad0, pad1;
+    uint16_t	base, pad2;
    uint32_t	ptr, ptr_cur,
 		addr;
    int		count, eot,
 		slot,
-		irq_mode[2], irq_pin,
-		irq_line;
+		irq_mode[2], irq_level[2],
+		irq_pin, irq_line;
 } sff8038i_t;


@@ -39,6 +41,11 @@ extern int	sff_bus_master_dma_write(int channel, uint8_t *data, int transfer_len

 extern void	sff_bus_master_set_irq(int channel, void *priv);

+extern int	sff_bus_master_dma(int channel, uint8_t *data, int transfer_length, int out, void *priv);
+
+extern void	sff_bus_master_write(uint16_t port, uint8_t val, void *priv);
+extern uint8_t	sff_bus_master_read(uint16_t port, void *priv);
+
 extern void	sff_bus_master_reset(sff8038i_t *dev, uint16_t old_base);

 extern void	sff_set_slot(sff8038i_t *dev, int slot);
@@ -47,3 +54,5 @@ extern void	sff_set_irq_line(sff8038i_t *dev, int irq_line);

 extern void	sff_set_irq_mode(sff8038i_t *dev, int channel, int irq_mode);
 extern void	sff_set_irq_pin(sff8038i_t *dev, int irq_pin);
+
+extern void	sff_set_irq_level(sff8038i_t *dev, int channel, int irq_level);
--- a/src/include/86box/hwm.h
+++ b/src/include/86box/hwm.h
@@ -36,6 +36,7 @@ typedef struct {
    uint8_t	regs[8];
    uint8_t	addr_register;
    uint8_t	i2c_addr: 7, i2c_state: 2;
+    uint8_t	i2c_enabled: 1;
 } lm75_t;


@@ -63,6 +64,7 @@ extern const device_t	lm75_w83781d_device;

 extern const device_t	lm78_device;
 extern const device_t	w83781d_device;
+extern const device_t	w83781d_p5a_device;
 extern const device_t	as99127f_device;
 extern const device_t	as99127f_rev2_device;
 extern const device_t	w83782d_device;
--- a/src/include/86box/keyboard.h
+++ b/src/include/86box/keyboard.h
@@ -72,14 +72,12 @@ extern const device_t	keyboard_xt_olivetti_device;
 extern const device_t	keyboard_xt_zenith_device;
 extern const device_t	keyboard_at_device;
 extern const device_t	keyboard_at_ami_device;
-extern const device_t	keyboard_at_samsung_device;
 extern const device_t	keyboard_at_toshiba_device;
 extern const device_t	keyboard_at_olivetti_device;
 extern const device_t	keyboard_at_ncr_device;
 extern const device_t	keyboard_ps2_device;
 extern const device_t	keyboard_ps2_ps1_device;
 extern const device_t	keyboard_ps2_ps1_pci_device;
-extern const device_t	keyboard_ps2_ps2_device;
 extern const device_t	keyboard_ps2_xi8088_device;
 extern const device_t	keyboard_ps2_ami_device;
 extern const device_t	keyboard_ps2_olivetti_device;
@@ -108,12 +106,15 @@ extern int	keyboard_isfsexit(void);
 extern int	keyboard_ismsexit(void);
 extern void	keyboard_set_is_amstrad(int ams);

-extern void	keyboard_at_adddata_keyboard_raw(uint8_t val);
 extern void	keyboard_at_adddata_mouse(uint8_t val);
+extern void	keyboard_at_adddata_mouse_direct(uint8_t val);
+extern void	keyboard_at_adddata_mouse_cmd(uint8_t val);
 extern void	keyboard_at_mouse_reset(void);
 extern uint8_t	keyboard_at_mouse_pos(void);
+extern int	keyboard_at_fixed_channel(void);
 extern void	keyboard_at_set_mouse(void (*mouse_write)(uint8_t val,void *), void *);
 extern void	keyboard_at_set_a20_key(int state);
+extern void	keyboard_at_set_mode(int ps2);
 extern uint8_t	keyboard_at_get_mouse_scan(void);
 extern void	keyboard_at_set_mouse_scan(uint8_t val);
 extern void	keyboard_at_reset(void);
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -98,9 +98,11 @@ enum {
    MACHINE_TYPE_8086,
    MACHINE_TYPE_286,
    MACHINE_TYPE_386SX,
+    MACHINE_TYPE_486SLC,
    MACHINE_TYPE_386DX,
    MACHINE_TYPE_386DX_486,
    MACHINE_TYPE_486,
+    MACHINE_TYPE_486_S2,
    MACHINE_TYPE_486_S3,
    MACHINE_TYPE_486_MISC,
    MACHINE_TYPE_SOCKET4,
@@ -252,6 +254,8 @@ extern int	machine_at_mr286_init(const machine_t *);
 extern int	machine_at_neat_init(const machine_t *);
 extern int	machine_at_neat_ami_init(const machine_t *);

+extern int	machine_at_quadt386sx_init(const machine_t *);
+
 extern int	machine_at_award286_init(const machine_t *);
 extern int	machine_at_gdc212m_init(const machine_t *);
 extern int	machine_at_gw286ct_init(const machine_t *);
@@ -273,20 +277,19 @@ extern int	machine_at_shuttle386sx_init(const machine_t *);
 extern int	machine_at_adi386sx_init(const machine_t *);
 extern int	machine_at_cmdsl386sx16_init(const machine_t *);
 extern int	machine_at_cmdsl386sx25_init(const machine_t *);
+extern int	machine_at_dataexpert386sx_init(const machine_t *);
 extern int	machine_at_spc6033p_init(const machine_t *);
 extern int	machine_at_wd76c10_init(const machine_t *);
+extern int	machine_at_arb1374_init(const machine_t *);
+extern int	machine_at_sbc_350a_init(const machine_t *);
 extern int	machine_at_flytech386_init(const machine_t *);
+extern int	machine_at_mr1217_init(const machine_t *);
+extern int	machine_at_pja511m_init(const machine_t *);
+extern int	machine_at_prox1332_init(const machine_t *);

 extern int	machine_at_awardsx_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_M6117)
-extern int	machine_at_arb1375_init(const machine_t *);
-extern int	machine_at_pja511m_init(const machine_t *);
-#endif

-extern int  machine_at_pc916sx_init(const machine_t *);
-
-extern int  machine_at_m30008_init(const machine_t *);
-extern int  machine_at_m30015_init(const machine_t *);
+extern int 	machine_at_pc916sx_init(const machine_t *);

 #ifdef EMU_DEVICE_H
 extern const device_t	*at_ama932j_get_device(void);
@@ -294,7 +297,6 @@ extern const device_t	*at_flytech386_get_device(void);
 extern const device_t	*at_cmdsl386sx25_get_device(void);
 extern const device_t	*at_spc4620p_get_device(void);
 extern const device_t	*at_spc6033p_get_device(void);
-extern const device_t	*at_m30008_get_device(void);
 #endif

 /* m_at_386dx_486.c */
@@ -312,6 +314,9 @@ extern int	machine_at_cs4031_init(const machine_t *);

 extern int	machine_at_pb410a_init(const machine_t *);

+extern int	machine_at_decpc_lpv_init(const machine_t *);
+extern int	machine_at_acerv10_init(const machine_t *);
+
 extern int	machine_at_acera1g_init(const machine_t *);
 extern int	machine_at_ali1429_init(const machine_t *);
 extern int	machine_at_winbios1429_init(const machine_t *);
@@ -323,9 +328,9 @@ extern int	machine_at_opti495_mr_init(const machine_t *);
 extern int	machine_at_vect486vl_init(const machine_t *);
 extern int	machine_at_d824_init(const machine_t *);

-extern int	machine_at_pcs46c_init(const machine_t *);
-
 extern int	machine_at_403tg_init(const machine_t *);
+extern int	machine_at_403tg_rev_d_init(const machine_t *);
+extern int	machine_at_403tg_rev_d_mr_init(const machine_t *);
 extern int	machine_at_pc330_6573_init(const machine_t *);
 extern int	machine_at_mvi486_init(const machine_t *);

@@ -340,6 +345,7 @@ extern int	machine_at_dtk486_init(const machine_t *);
 extern int	machine_at_px471_init(const machine_t *);
 extern int	machine_at_win471_init(const machine_t *);
 extern int	machine_at_vi15g_init(const machine_t *);
+extern int	machine_at_green_b_init(const machine_t *);

 extern int	machine_at_r418_init(const machine_t *);
 extern int	machine_at_ls486e_init(const machine_t *);
@@ -347,29 +353,42 @@ extern int	machine_at_4dps_init(const machine_t *);
 extern int	machine_at_4sa2_init(const machine_t *);
 extern int	machine_at_m4li_init(const machine_t *);
 extern int	machine_at_alfredo_init(const machine_t *);
+extern int	machine_at_ninja_init(const machine_t *);
 extern int	machine_at_486sp3_init(const machine_t *);
 extern int	machine_at_486sp3c_init(const machine_t *);
 extern int	machine_at_486sp3g_init(const machine_t *);
 extern int	machine_at_486ap4_init(const machine_t *);
+extern int	machine_at_g486vpa_init(const machine_t *);
 extern int	machine_at_486vipio2_init(const machine_t *);
 extern int	machine_at_abpb4_init(const machine_t *);
 extern int	machine_at_win486pci_init(const machine_t *);
+extern int	machine_at_ms4145_init(const machine_t *);
+extern int	machine_at_sbc_490_init(const machine_t *);
+extern int	machine_at_tf_486_init(const machine_t *);

-extern int	machine_at_atc1415_init(const machine_t *);
-extern int	machine_at_ecs486_init(const machine_t *);
-extern int	machine_at_hot433_init(const machine_t *);
+extern int	machine_at_pci400c_b_init(const machine_t *);
+extern int	machine_at_g486ip_init(const machine_t *);

 extern int	machine_at_itoxstar_init(const machine_t *);
+extern int	machine_at_arb1423c_init(const machine_t *);
 extern int	machine_at_arb1479_init(const machine_t *);
 extern int	machine_at_pcm9340_init(const machine_t *);
 extern int	machine_at_pcm5330_init(const machine_t *);

+extern int	machine_at_ecs486_init(const machine_t *);
+extern int	machine_at_hot433_init(const machine_t *);
+extern int	machine_at_atc1415_init(const machine_t *);
+extern int	machine_at_actionpc2600_init(const machine_t *);
+extern int	machine_at_m919_init(const machine_t *);
+extern int	machine_at_spc7700p_lw_init(const machine_t *);
+
 #ifdef EMU_DEVICE_H
 extern const device_t 	*at_acera1g_get_device(void);
 extern const device_t 	*at_vect486vl_get_device(void);
 extern const device_t 	*at_d824_get_device(void);
 extern const device_t 	*at_pcs46c_get_device(void);
 extern const device_t 	*at_valuepoint433_get_device(void);
+extern const device_t  	*at_sbc_490_get_device(void);
 #endif

 /* m_at_commodore.c */
@@ -383,118 +402,144 @@ extern int	machine_at_portableiii386_init(const machine_t *);
 extern const device_t 	*at_cpqiii_get_device(void);
 #endif

-/* m_at_socket4_5.c */
-extern int	machine_at_excalibur_init(const machine_t *);
+/* m_at_socket4.c */
+extern void	machine_at_premiere_common_init(const machine_t *, int);
+extern void	machine_at_award_common_init(const machine_t *);

-extern int  machine_at_pat54pv_init(const machine_t *);
+extern void	machine_at_sp4_common_init(const machine_t *model);

-extern int	machine_at_hot543_init(const machine_t *);
-extern int	machine_at_p54vl_init(const machine_t *);
-
-extern int	machine_at_batman_init(const machine_t *);
-extern int	machine_at_ambradp60_init(const machine_t *);
+extern int	machine_at_excalibur_pci_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 *);
+extern int	machine_at_ambradp60_init(const machine_t *);
 extern int	machine_at_valuepointp60_init(const machine_t *);
-extern int	machine_at_p5mp3_init(const machine_t *);
-extern int	machine_at_pb520r_init(const machine_t *);
+extern int	machine_at_revenge_init(const machine_t *);
 extern int	machine_at_586mc1_init(const machine_t *);
+extern int	machine_at_pb520r_init(const machine_t *);

+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_p5sp4_init(const machine_t *);
+
+#ifdef EMU_DEVICE_H
+extern const device_t	*at_pb520r_get_device(void);
+#endif
+
+/* m_at_socket5.c */
 extern int	machine_at_plato_init(const machine_t *);
 extern int	machine_at_ambradp90_init(const machine_t *);
 extern int	machine_at_430nx_init(const machine_t *);

-extern int	machine_at_p54tp4xe_init(const machine_t *);
-extern int	machine_at_endeavor_init(const machine_t *);
-extern int	machine_at_zappa_init(const machine_t *);
-extern int	machine_at_mb500n_init(const machine_t *);
-extern int	machine_at_apollo_init(const machine_t *);
-extern int	machine_at_vectra54_init(const machine_t *);
-extern int	machine_at_powermatev_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 *);
+extern int	machine_at_hawk_init(const machine_t *);
+
+extern int	machine_at_pat54pv_init(const machine_t *);
+
+extern int	machine_at_hot543_init(const machine_t *);

-extern int	machine_at_p5sp4_init(const machine_t *);
 extern int	machine_at_p54sp4_init(const machine_t *);
 extern int	machine_at_sq588_init(const machine_t *);

-extern int	machine_at_hot539_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_gw2katx_init(const machine_t *);
+extern int	machine_at_thor_init(const machine_t *);
+extern int	machine_at_mrthor_init(const machine_t *);
+extern int	machine_at_endeavor_init(const machine_t *);
+extern int	machine_at_ms5119_init(const machine_t *);
+extern int	machine_at_pb640_init(const machine_t *);
+extern int	machine_at_fmb_init(const machine_t *);
+
+extern int	machine_at_acerm3a_init(const machine_t *);
+extern int	machine_at_ap53_init(const machine_t *);
+extern int	machine_at_8500tuc_init(const machine_t *);
+extern int	machine_at_p55t2s_init(const machine_t *);
+
+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 *);

 #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_pb520r_get_device(void);
 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);
 #endif

-/* m_at_socket7_s7.c */
-extern int	machine_at_ap5s_init(const machine_t *);
-
-extern int	machine_at_chariot_init(const machine_t *);
-extern int	machine_at_mr586_init(const machine_t *);
-extern int	machine_at_thor_init(const machine_t *);
-extern int	machine_at_gw2katx_init(const machine_t *);
-extern int	machine_at_mrthor_init(const machine_t *);
-extern int	machine_at_pb640_init(const machine_t *);
-
-extern int	machine_at_acerm3a_init(const machine_t *);
+/* m_at_socket7.c */
 extern int	machine_at_acerv35n_init(const machine_t *);
-extern int	machine_at_ap53_init(const machine_t *);
 extern int	machine_at_p55t2p4_init(const machine_t *);
-extern int	machine_at_p55t2s_init(const machine_t *);
-extern int	machine_at_8500tuc_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_p65up5_cp55t2d_init(const machine_t *);

-extern int	machine_at_mb520n_init(const machine_t *);
+extern int	machine_at_ap5vm_init(const machine_t *);
 extern int	machine_at_p55tvp4_init(const machine_t *);
-extern int	machine_at_p55va_init(const machine_t *);
-extern int	machine_at_i430vx_init(const machine_t *);
 extern int	machine_at_5ivg_init(const machine_t *);
-extern int	machine_at_brio80xx_init(const machine_t *);
 extern int	machine_at_8500tvxa_init(const machine_t *);
 extern int	machine_at_presario2240_init(const machine_t *);
 extern int	machine_at_presario4500_init(const machine_t *);
-extern int	machine_at_gw2kte_init(const machine_t *);
+extern int	machine_at_p55va_init(const machine_t *);
+extern int	machine_at_brio80xx_init(const machine_t *);
 extern int	machine_at_pb680_init(const machine_t *);
+extern int	machine_at_mb520n_init(const machine_t *);
+extern int	machine_at_i430vx_init(const machine_t *);

 extern int	machine_at_nupro592_init(const machine_t *);
 extern int	machine_at_tx97_init(const machine_t *);
-extern int	machine_at_ym430tx_init(const machine_t *);
 #if defined(DEV_BRANCH) && defined(NO_SIO)
 extern int	machine_at_an430tx_init(const machine_t *);
 #endif
+extern int	machine_at_ym430tx_init(const machine_t *);
 extern int	machine_at_mb540n_init(const machine_t *);
 extern int	machine_at_p5mms98_init(const machine_t *);

-extern int	machine_at_r534f_init(const machine_t *);
-extern int	machine_at_ms5146_init(const machine_t *);
-
-#if defined(DEV_BRANCH) && defined(USE_M154X)
-extern int	machine_at_m560_init(const machine_t *);
-extern int	machine_at_ms5164_init(const machine_t *);
-#endif
-
 extern int	machine_at_ficva502_init(const machine_t *);

 extern int	machine_at_ficpa2012_init(const machine_t *);

+extern int	machine_at_r534f_init(const machine_t *);
+extern int	machine_at_ms5146_init(const machine_t *);
+
+extern int	machine_at_m560_init(const machine_t *);
+extern int	machine_at_ms5164_init(const machine_t *);
+
 #ifdef EMU_DEVICE_H
-extern const device_t 	*at_thor_get_device(void);
-extern const device_t	*at_pb640_get_device(void);
+extern const device_t	*at_presario2240_get_device(void);
+#define at_presario4500_get_device	at_presario2240_get_device
 #endif

-/* m_at_super7_ss7.c */
+/* m_at_sockets7.c */
+extern int	machine_at_p5a_init(const machine_t *);
+extern int	machine_at_m579_init(const machine_t *);
+extern int	machine_at_ga_5aa_init(const machine_t *);
+extern int	machine_at_ga_5ax_init(const machine_t *);
+
 extern int	machine_at_ax59pro_init(const machine_t *);
 extern int	machine_at_mvp3_init(const machine_t *);
 extern int	machine_at_ficva503a_init(const machine_t *);
+extern int	machine_at_sy_5ema_pro_init(const machine_t *);

 /* m_at_socket8.c */
-#if defined(DEV_BRANCH) && defined(USE_I450KX)
 extern int	machine_at_p6rp4_init(const machine_t *);
-#endif

 extern int	machine_at_686nx_init(const machine_t *);
 extern int	machine_at_v60n_init(const machine_t *);
@@ -509,6 +554,8 @@ extern void	machine_at_p65up5_common_init(const machine_t *, const device_t *nor
 extern int	machine_at_p65up5_cp6nd_init(const machine_t *);

 /* m_at_slot1.c */
+extern int	machine_at_m729_init(const machine_t *);
+
 extern int	machine_at_p65up5_cpknd_init(const machine_t *);
 extern int	machine_at_kn97_init(const machine_t *);

@@ -525,9 +572,6 @@ 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_p6sba_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(NO_SIO)
-extern int	machine_at_ergox365_init(const machine_t *);
-#endif
 extern int	machine_at_ficka6130_init(const machine_t *);
 extern int	machine_at_p3v133_init(const machine_t *);
 extern int	machine_at_p3v4x_init(const machine_t *);
@@ -651,10 +695,6 @@ extern int	machine_xt_pc500_init(const machine_t *);

 extern int	machine_xt_iskra3104_init(const machine_t *);

-#if defined(DEV_BRANCH) && defined(USE_HEDAKA)
-extern int 	machine_xt_hed919_init(const machine_t *);
-#endif
-
 /* m_xt_compaq.c */
 extern int	machine_xt_compaq_deskpro_init(const machine_t *);
 extern int	machine_xt_compaq_portable_init(const machine_t *);
--- a/src/include/86box/mem.h
+++ b/src/include/86box/mem.h
@@ -64,6 +64,15 @@
 #define ACCESS_READ		    1
 #define ACCESS_WRITE		    2

+#define ACCESS_SMRAM_OFF	    0
+#define ACCESS_SMRAM_X		    1
+#define ACCESS_SMRAM_W		    2
+#define ACCESS_SMRAM_WX		    3
+#define ACCESS_SMRAM_R		    4
+#define ACCESS_SMRAM_RX		    5
+#define ACCESS_SMRAM_RW		    6
+#define ACCESS_SMRAM_RWX	    7
+
 /* Conversion #define's - we need these to seamlessly convert the old mem_set_mem_state() calls to
   the new stuff in order to make this a drop in replacement.

@@ -80,7 +89,10 @@
 /* Internal execute access, external read access. */
 #define MEM_READ_EXTERNAL_EX	0
 #define MEM_READ_SMRAM		(ACCESS_X_SMRAM | ACCESS_R_SMRAM)
+#define MEM_READ_CACHE		(ACCESS_X_CACHE | ACCESS_R_CACHE)
 #define MEM_READ_SMRAM_EX	(ACCESS_X_SMRAM)
+#define MEM_EXEC_SMRAM		MEM_READ_SMRAM_EX
+#define MEM_READ_SMRAM_2	(ACCESS_R_SMRAM)
 /* Theese two are going to be identical. */
 #define MEM_READ_DISABLED_EX	MEM_READ_DISABLED
 #define MEM_READ_MASK		0x7c1f
@@ -93,6 +105,7 @@
 #define MEM_WRITE_ROMCS		(ACCESS_W_ROMCS)
 #define MEM_WRITE_EXTANY	(ACCESS_W_ROMCS)
 #define MEM_WRITE_SMRAM		(ACCESS_W_SMRAM)
+#define MEM_WRITE_CACHE		(ACCESS_W_CACHE)
 /* Theese two are going to be identical. */
 #define MEM_WRITE_DISABLED_EX	MEM_READ_DISABLED
 #define MEM_WRITE_MASK		0x03e0
@@ -132,10 +145,18 @@
 	mem_set_access(ACCESS_SMM, 0, base, size, access)
 #define mem_set_mem_state_both(base, size, access) \
 	mem_set_access(ACCESS_ALL, 0, base, size, access)
+#define mem_set_mem_state_cpu_both(base, size, access) \
+	mem_set_access(ACCESS_CPU_BOTH, 0, base, size, access)
+#define mem_set_mem_state_bus_both(base, size, access) \
+	mem_set_access(ACCESS_BUS_BOTH, 0, base, size, access)
 #define mem_set_mem_state_smram(smm, base, size, is_smram) \
 	mem_set_access((smm ? ACCESS_SMM : ACCESS_NORMAL), 1, base, size, is_smram)
 #define mem_set_mem_state_smram_ex(smm, base, size, is_smram) \
 	mem_set_access((smm ? ACCESS_SMM : ACCESS_NORMAL), 2, base, size, is_smram)
+#define mem_set_access_smram_cpu(smm, base, size, is_smram) \
+	mem_set_access((smm ? ACCESS_CPU_SMM : ACCESS_CPU), 1, base, size, is_smram)
+#define mem_set_access_smram_bus(smm, base, size, is_smram) \
+	mem_set_access((smm ? ACCESS_BUS_SMM : ACCESS_BUS), 1, base, size, is_smram)
 #define flushmmucache_cr3 \
 	flushmmucache_nopc

--- a/src/include/86box/nvr.h
+++ b/src/include/86box/nvr.h
@@ -95,6 +95,7 @@ extern const device_t piix4_nvr_device;
 extern const device_t ls486e_nvr_device;
 extern const device_t ami_apollo_nvr_device;
 extern const device_t via_nvr_device;
+extern const device_t p6rp4_nvr_device;
 #endif


--- a/src/include/86box/pci.h
+++ b/src/include/86box/pci.h
@@ -45,9 +45,15 @@
 #define PCI_MIRQ1 1
 #define PCI_MIRQ2 2
 #define PCI_MIRQ3 3
+#define PCI_MIRQ4 4
+#define PCI_MIRQ5 5
+#define PCI_MIRQ6 6
+#define PCI_MIRQ7 7

 #define PCI_IRQ_DISABLED -1

+#define PCI_ADD_STRICT	0x80
+
 enum {
    PCI_CARD_NORTHBRIDGE = 0,
    PCI_CARD_AGPBRIDGE,
@@ -119,10 +125,14 @@ extern void     trc_init(void);
 extern uint8_t	trc_read(uint16_t port, void *priv);
 extern void	trc_write(uint16_t port, uint8_t val, void *priv);

+extern void	pci_bridge_set_ctl(void *priv, uint8_t ctl);
+

 #ifdef EMU_DEVICE_H
 extern const device_t dec21150_device;

+extern const device_t ali5243_agp_device;
+extern const device_t ali5247_agp_device;
 extern const device_t i440lx_agp_device;
 extern const device_t i440bx_agp_device;
 extern const device_t i440gx_agp_device;
--- a/src/include/86box/pic.h
+++ b/src/include/86box/pic.h
@@ -33,6 +33,11 @@ typedef struct pic {
 extern pic_t	pic, pic2;


+extern void	pic_reset_smi_irq_mask(void);
+extern void	pic_set_smi_irq_mask(int irq, int set);
+extern uint16_t	pic_get_smi_irq_status(void);
+extern void	pic_clear_smi_irq_status(int irq);
+
 extern int	pic_elcr_get_enabled(void);
 extern void	pic_elcr_set_enabled(int enabled);
 extern void	pic_elcr_io_handler(int set);
@@ -40,6 +45,7 @@ extern void	pic_elcr_write(uint16_t port, uint8_t val, void *priv);
 extern uint8_t	pic_elcr_read(uint16_t port, void *priv);

 extern void	pic_set_shadow(int sh);
+extern void	pic_set_pci(void);
 extern void	pic_init(void);
 extern void	pic_init_pcjr(void);
 extern void	pic2_init(void);
--- a/src/include/86box/port_6x.h
+++ b/src/include/86box/port_6x.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.
+ *
+ *		Header for the implementation of Port 6x used by various
+ *		machines.
+ *
+ *
+ *
+ * Authors:	Miran Grca, <mgrca8@gmail.com>
+ *
+ *		Copyright 2021 Miran Grca.
+ */
+#ifndef EMU_PORT_6X_H
+# define EMU_PORT_6X_H
+
+
+#ifdef _TIMER_H_
+typedef struct
+{
+    uint8_t	refresh, flags;
+
+    pc_timer_t	refresh_timer;
+} port_6x_t;
+#endif
+
+
+extern const device_t	port_6x_device;
+extern const device_t	port_6x_xi8088_device;
+extern const device_t	port_6x_ps2_device;
+extern const device_t	port_6x_olivetti_device;
+
+
+#endif	/*EMU_PORT_6X_H*/
--- a/src/include/86box/serial.h
+++ b/src/include/86box/serial.h
@@ -27,6 +27,8 @@
 #define SERIAL_NS16450		2
 #define SERIAL_NS16550		3

+#define SERIAL_FIFO_SIZE	16
+
 /* Default settings for the standard ports. */
 #define SERIAL1_ADDR		0x03f8
 #define SERIAL1_IRQ		4
@@ -54,7 +56,7 @@ typedef struct serial_s

    uint8_t rcvr_fifo_pos, xmit_fifo_pos,
 	    pad0, pad1,
-	    rcvr_fifo[16], xmit_fifo[16];
+	    rcvr_fifo[SERIAL_FIFO_SIZE], xmit_fifo[SERIAL_FIFO_SIZE];

    pc_timer_t transmit_timer, timeout_timer;
    double clock_src, transmit_period;
--- a/src/include/86box/sio.h
+++ b/src/include/86box/sio.h
@@ -22,12 +22,14 @@ extern const device_t	acc3221_device;
 extern const device_t	f82c710_device;
 extern const device_t	f82c606_device;
 extern const device_t	fdc37c651_device;
+extern const device_t	fdc37c651_ide_device;
 extern const device_t	fdc37c661_device;
 extern const device_t	fdc37c663_device;
 extern const device_t	fdc37c663_ide_device;
 extern const device_t	fdc37c665_device;
 extern const device_t	fdc37c665_ide_device;
 extern const device_t	fdc37c666_device;
+extern const device_t	fdc37c67x_device;
 extern const device_t	fdc37c669_device;
 extern const device_t	fdc37c669_370_device;
 extern const device_t	fdc37c931apm_device;
@@ -54,6 +56,7 @@ extern const device_t   pc87311_ide_device;
 extern const device_t	pc87332_device;
 extern const device_t	pc87332_398_device;
 extern const device_t	pc87332_398_ide_device;
+extern const device_t	pc87332_398_ide_sec_device;
 extern const device_t	pc87332_398_ide_fdcon_device;
 extern const device_t	pc97307_device;
 extern const device_t   prime3b_device;
--- a/src/include/86box/smbus.h
+++ b/src/include/86box/smbus.h
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ *
+  *		Definitions for the SMBus host controllers.
+ *
+ *
+ *
+ * Authors:	RichardG, <richardg867@gmail.com>
+ *
+ *		Copyright 2020 RichardG.
+ */
+#ifndef EMU_SMBUS_PIIX4_H
+# define EMU_SMBUS_PIIX4_H
+
+
+#define SMBUS_PIIX4_BLOCK_DATA_SIZE	32
+#define SMBUS_PIIX4_BLOCK_DATA_MASK	(SMBUS_PIIX4_BLOCK_DATA_SIZE - 1)
+
+#define SMBUS_ALI7101_BLOCK_DATA_SIZE	32
+#define SMBUS_ALI7101_BLOCK_DATA_MASK	(SMBUS_ALI7101_BLOCK_DATA_SIZE - 1)
+
+
+enum {
+    SMBUS_PIIX4 = 0,
+    SMBUS_VIA
+};
+
+typedef struct {
+    uint32_t	local;
+    uint16_t	io_base;
+    int		clock;
+    double	bit_period;
+    uint8_t	stat, next_stat, ctl, cmd, addr,
+		data0, data1,
+		index, data[SMBUS_PIIX4_BLOCK_DATA_SIZE];
+    pc_timer_t	response_timer;
+    void	*i2c;
+} smbus_piix4_t;
+
+typedef struct {
+    uint32_t	local;
+    uint16_t	io_base;
+    uint8_t	stat, next_stat, ctl, cmd, addr,
+		data0, data1,
+		index, data[SMBUS_ALI7101_BLOCK_DATA_SIZE];
+    pc_timer_t	response_timer;
+    void	*i2c;
+} smbus_ali7101_t;
+
+
+extern void	smbus_piix4_remap(smbus_piix4_t *dev, uint16_t new_io_base, uint8_t enable);
+extern void	smbus_piix4_setclock(smbus_piix4_t *dev, int clock);
+
+extern void	smbus_ali7101_remap(smbus_ali7101_t *dev, uint16_t new_io_base, uint8_t enable);
+
+
+#ifdef EMU_DEVICE_H
+extern const device_t piix4_smbus_device;
+extern const device_t via_smbus_device;
+
+extern const device_t ali7101_smbus_device;
+#endif
+
+
+#endif	/*EMU_SMBUS_PIIX4_H*/
--- a/src/include/86box/smram.h
+++ b/src/include/86box/smram.h
@@ -39,12 +39,19 @@ extern void	smram_recalc_all(int ret);
 extern void	smram_del(smram_t *smr);
 /* Add a SMRAM mapping. */
 extern smram_t *smram_add(void);
+/* Set memory state in the specified model (normal or SMM) according to the specified flags,
+   separately for bus and CPU. */
+extern void	smram_map_ex(int bus, int smm, uint32_t addr, uint32_t size, int is_smram);
 /* Set memory state in the specified model (normal or SMM) according to the specified flags. */
 extern void	smram_map(int smm, uint32_t addr, uint32_t size, int is_smram);
 /* Disable a specific SMRAM mapping. */
 extern void	smram_disable(smram_t *smr);
 /* Disable all SMRAM mappings. */
 extern void	smram_disable_all(void);
+/* Enable SMRAM mappings according to flags for both normal and SMM modes, separately for bus
+   and CPU. */
+extern void smram_enable_ex(smram_t *smr, uint32_t host_base, uint32_t ram_base, uint32_t size,
+			    int flags_normal, int flags_normal_bus, int flags_smm, int flags_smm_bus);
 /* Enable SMRAM mappings according to flags for both normal and SMM modes. */
 extern void	smram_enable(smram_t *smr, uint32_t host_base, uint32_t ram_base, uint32_t size,
 			     int flags_normal, int flags_smm);
@@ -52,6 +59,8 @@ extern void	smram_enable(smram_t *smr, uint32_t host_base, uint32_t ram_base, ui
 extern int	smram_enabled(smram_t *smr);
 /* Changes the SMRAM state. */
 extern void	smram_state_change(smram_t *smr, int smm, int flags);
+/* Enables or disables the use of a separate SMRAM for addresses below A0000. */
+extern void	smram_set_separate_smram(uint8_t set);


 #endif	/*EMU_SMRAM_H*/
--- a/src/include/86box/spd.h
+++ b/src/include/86box/spd.h
@@ -106,6 +106,8 @@ typedef struct {

 extern void spd_register(uint8_t ram_type, uint8_t slot_mask, uint16_t max_module_size);
 extern void spd_write_drbs(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit);
+extern void spd_write_drbs_interleaved(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit);
+extern void spd_write_drbs_ali1621(uint8_t *regs, uint8_t reg_min, uint8_t reg_max);


 #endif	/*EMU_SPD_H*/
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -25,7 +25,7 @@
 #define FLAG_NOSKEW		16
 #define FLAG_ADDR_BY16		32
 #define FLAG_RAMDAC_SHIFT	64
-
+#define FLAG_128K_MASK		128

 typedef struct {
    int ena,
@@ -50,7 +50,8 @@ typedef struct svga_t
 	    lowres, interlace, linedbl, rowcount,
 	    set_reset_disabled, bpp, ramdac_type, fb_only,
 	    readmode, writemode, readplane,
-	    hwcursor_oddeven, dac_hwcursor_oddeven, overlay_oddeven;
+	    hwcursor_oddeven, dac_hwcursor_oddeven, overlay_oddeven,
+	    fcr, hblank_overscan;

    int dac_addr, dac_pos, dac_r, dac_g,
 	vtotal, dispend, vsyncstart, split, vblankstart,
@@ -60,8 +61,9 @@ typedef struct svga_t
 	con, cursoron, blink, scrollcache, char_width,
 	firstline, lastline, firstline_draw, lastline_draw,
 	displine, fullchange, x_add, y_add, pan,
-	vram_display_mask, vidclock,
-	hwcursor_on, dac_hwcursor_on, overlay_on, set_override;
+	vram_display_mask, vidclock, dots_per_clock, hblank_ext,
+	hwcursor_on, dac_hwcursor_on, overlay_on, set_override,
+	hblankstart, hblankend, hblank_sub, hblank_end_val, hblank_end_len;

    /*The three variables below allow us to implement memory maps like that seen on a 1MB Trio64 :
      0MB-1MB - VRAM
--- a/src/include/86box/vid_svga_render.h
+++ b/src/include/86box/vid_svga_render.h
@@ -44,6 +44,8 @@ void svga_render_4bpp_lowres(svga_t *svga);
 void svga_render_4bpp_highres(svga_t *svga);
 void svga_render_8bpp_lowres(svga_t *svga);
 void svga_render_8bpp_highres(svga_t *svga);
+void svga_render_8bpp_tseng_lowres(svga_t *svga);
+void svga_render_8bpp_tseng_highres(svga_t *svga);
 void svga_render_8bpp_gs_lowres(svga_t *svga);
 void svga_render_8bpp_gs_highres(svga_t *svga);
 void svga_render_8bpp_rgb_lowres(svga_t *svga);
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -176,6 +176,7 @@ extern void	updatewindowsize(int x, int y);
 extern void	video_init(void);
 extern void	video_close(void);
 extern void	video_reset_close(void);
+extern void	video_pre_reset(int card);
 extern void	video_reset(int card);
 extern uint8_t	video_force_resize_get(void);
 extern void	video_force_resize_set(uint8_t res);
@@ -264,7 +265,11 @@ extern const device_t f82c425_video_device;
 /* NCR NGA */
 extern const device_t nga_device;

+/* Tseng ET3000AX */
+extern const device_t et3000_isa_device;
+
 /* Tseng ET4000AX */
+extern const device_t et4000_tc6058af_isa_device;
 extern const device_t et4000_isa_device;
 extern const device_t et4000k_isa_device;
 extern const device_t et4000k_tg286_isa_device;
@@ -316,7 +321,6 @@ extern const device_t oti037c_device;
 extern const device_t oti067_device;
 extern const device_t oti067_acer386_device;
 extern const device_t oti067_ama932j_device;
-extern const device_t oti067_m300_device;
 extern const device_t oti077_device;

 /* Paradise/WD (S)VGA */
@@ -375,6 +379,7 @@ extern const device_t s3_spea_mercury_p64v_pci_device;
 extern const device_t s3_elsa_winner2000_pro_x_964_pci_device;
 extern const device_t s3_elsa_winner2000_pro_x_pci_device;
 extern const device_t s3_trio64v2_dx_pci_device;
+extern const device_t s3_trio64v2_dx_onboard_pci_device;

 /* S3 ViRGE */
 extern const device_t s3_virge_325_pci_device;
@@ -397,6 +402,7 @@ extern const device_t sigma_device;
 extern const device_t tgui9400cxi_device;
 extern const device_t tgui9440_vlb_device;
 extern const device_t tgui9440_pci_device;
+extern const device_t tgui9440_onboard_pci_device;
 extern const device_t tgui9660_pci_device;
 extern const device_t tgui9680_pci_device;