Re-added the Dells

src/include/86box/machine.h

@@ -354,6 +354,10 @@ extern int	machine_at_excalibur_init(const machine_t *);
 
 extern int	machine_at_batman_init(const machine_t *);
 extern int	machine_at_ambradp60_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(USE_DELLS4)
+extern int	machine_at_dellxp60_init(const machine_t *);
+extern int	machine_at_opti560l_init(const machine_t *);
+#endif
 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 *);

src/machine/m_at_socket4_5.c

@@ -120,6 +120,43 @@ machine_at_batman_init(const machine_t *model)
     return ret;
 }
 
+#if defined(DEV_BRANCH) && defined(USE_VECT486VL)
+int
+machine_at_dellxp60_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/dellxp60/XP60-A08.ROM",
+			   0x000e0000, 131072, 0);
+			   
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_premiere_common_init(model, PCI_NO_IRQ_STEERING);
+
+    device_add(&i430lx_device);
+
+    return ret;
+}
+
+int
+machine_at_opti560l_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/opti560l/560L_A06.ROM",
+			   0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_premiere_common_init(model, PCI_NO_IRQ_STEERING);
+
+    device_add(&i430lx_device);
+
+    return ret;
+}
+#endif 
 
 int
 machine_at_ambradp60_init(const machine_t *model)

src/machine/machine_table.c

@@ -266,7 +266,11 @@ const machine_t machines[] = {
     /* 430LX */
     { "[i430LX] IBM Ambra DP60 PCI",		"ambradp60",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	    machine_at_ambradp60_init, NULL			},
     { "[i430LX] IBM PS/ValuePoint P60",		"valuepointp60",	MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  2,  128,   2, 127,	machine_at_valuepointp60_init, NULL			},
-    { "[i430LX] Intel Premiere/PCI",		"revenge",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	       machine_at_batman_init, NULL			},
+#if defined(DEV_BRANCH) && defined(USE_DELLS4)
+    { "[i430LX] Dell Dimension XPS P60",		"dellxp60",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	       machine_at_dellxp60_init, NULL			},
+    { "[i430LX] Dell OptiPlex 560/L",		"opti560l",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	       machine_at_opti560l_init, NULL			},
+#endif
+	{ "[i430LX] Intel Premiere/PCI",		"revenge",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	       machine_at_batman_init, NULL			},
     { "[i430LX] ASUS P/I-P5MP3",		"p5mp3",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,		 		  2,  192,   2, 127,	        machine_at_p5mp3_init, NULL			},
     { "[i430LX] Micro Star 586MC1",		"586mc1",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  2,  128,   2, 127,	       machine_at_586mc1_init, NULL			},
     { "[i430LX] Packard Bell PB520R",		"pb520r",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  136,   2, 127,	       machine_at_pb520r_init, at_pb520r_get_device	},

src/win/Makefile.mingw

@@ -117,6 +117,9 @@ ifeq ($(DEV_BUILD), y)
  ifndef USE_VECT486VL
   USE_VECT486VL	:= y
  endif
+ ifndef USE_DELLS4
+  USE_DELLS4	:= y
+ endif
 else
  ifndef DEBUG
   DEBUG		:= n
@@ -208,6 +211,9 @@ else
  ifndef USE_VECT486VL
   USE_VECT486VL	:= n
  endif
+ ifndef USE_DELLS4
+  USE_DELLS4	:= n
+ endif
 endif
 
 # Defaults for several build options (possibly defined in a chained file.)
@@ -630,6 +636,10 @@ ifeq ($(USE_VECT486VL), y)
 OPTS		+= -DUSE_VECT486VL
 endif
 
+ifeq ($(DELLS4), y)
+OPTS		+= -DUSE_DELLS4
+endif
+
 endif