From 0dc7e7c9ed23e95fd857df9665a29eceede5bee3 Mon Sep 17 00:00:00 2001
From: amdk6 <38372778+SauceJustSauce@users.noreply.github.com>
Date: Sun, 25 Oct 2020 15:21:25 +0200
Subject: [PATCH] Added the Micronics M4Li

---
 src/include/86box/machine.h  |  1 +
 src/machine/m_at_386dx_486.c | 27 +++++++++++++++++++++++++++
 src/machine/machine_table.c  |  1 +
 3 files changed, 29 insertions(+)

diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 4a7c8cde6..fbdb350e8 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -314,6 +314,7 @@ extern int	machine_at_r418_init(const machine_t *);
 extern int	machine_at_ls486e_init(const machine_t *);
 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_486sp3g_init(const machine_t *);
 extern int	machine_at_486ap4_init(const machine_t *);
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index fa4abc57a..c270e2d08 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -629,6 +629,33 @@ machine_at_r418_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_m4li_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/m4li/M4LI.04S",
+			   0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x06, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x01, PCI_CARD_IDE, 0, 0, 0, 0);
+
+    device_add(&fdc37c665_device);
+    device_add(&keyboard_ps2_pci_device);
+    device_add(&ide_cmd640_pci_device);
+
+    return ret;
+}
 
 int
 machine_at_ls486e_init(const machine_t *model)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 823a2dc03..9ab9af7ab 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -244,6 +244,7 @@ const machine_t machines[] = {
     { "[SiS 496] Lucky Star LS-486E",		"ls486e",		MACHINE_TYPE_486,		{{"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486},  {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_IDE_DUAL,						  1,  128,   1, 255,	       machine_at_ls486e_init, NULL			},
     { "[SiS 496] Rise Computer R418",		"r418",			MACHINE_TYPE_486,		{{"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486},  {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_IDE_DUAL,						  1,  255,   1, 255,		 machine_at_r418_init, NULL			},
     { "[SiS 496] Soyo 4SA2",			"4sa2",			MACHINE_TYPE_486,		{{"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486},  {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_IDE_DUAL,						  1,  255,   1, 255,		 machine_at_4sa2_init, NULL			},
+    { "[SiS 496] Micronics M4Li",			"m4li",			MACHINE_TYPE_486,		{{"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486},  {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_IDE_DUAL,						  1,  128,   1, 127,		 machine_at_m4li_init, NULL			},
     { "[SiS 496] Zida Tomato 4DP",		"4dps",			MACHINE_TYPE_486,		{{"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486},  {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_IDE_DUAL,						  1,  255,   1, 255,		 machine_at_4dps_init, NULL			},
 #if defined(DEV_BRANCH) && defined(NO_SIO)
     { "[VIA VT82C496G] FIC VIP-IO2",		"486vipio2",		MACHINE_TYPE_486,		{{"Intel", cpus_i486},        {"AMD", cpus_Am486},   {"Cyrix", cpus_Cx486},  {"",      NULL},     {"",      NULL}}, MACHINE_PCIV | MACHINE_IDE_DUAL,						  1,  128,   1, 255,	    machine_at_486vipio2_init, NULL			},