Removed the PS/ValuePoint from the Dev branch and moved the other Socket 4 Dell there, and the PS/ValuePoint now uses the SMC FDC73C665 Super I/O chip and a PCI version of the PS/1 keyboard controller.

src/device/keyboard_at.c

@@ -2479,6 +2479,16 @@ const device_t keyboard_ps2_ps1_device = {
     NULL, NULL, NULL, NULL
 };
 
+const device_t keyboard_ps2_ps1_pci_device = {
+    "PS/2 Keyboard (IBM PS/1)",
+    DEVICE_PCI,
+    KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
+    kbd_init,
+    kbd_close,
+    kbd_reset,
+    NULL, NULL, NULL, NULL
+};
+
 const device_t keyboard_ps2_xi8088_device = {
     "PS/2 Keyboard (Xi8088)",
     0,

src/include/86box/keyboard.h

@@ -73,6 +73,7 @@ extern const device_t	keyboard_at_ami_device;
 extern const device_t	keyboard_at_toshiba_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;

src/include/86box/machine.h

@@ -309,11 +309,9 @@ 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_VPP60)
 extern int	machine_at_valuepointp60_init(const machine_t *);
-#endif
+#if defined(DEV_BRANCH) && defined(USE_DELLS4)
 extern int	machine_at_opti560l_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_DELLXP60)
 extern int	machine_at_dellxp60_init(const machine_t *);
 #endif
 extern int	machine_at_p5mp3_init(const machine_t *);

src/machine/m_at_socket4_5.c

@@ -140,7 +140,6 @@ machine_at_ambradp60_init(const machine_t *model)
 }
 
 
-#if defined(DEV_BRANCH) && defined(USE_VPP60)
 int
 machine_at_valuepointp60_init(const machine_t *model)
 {
@@ -155,23 +154,22 @@ machine_at_valuepointp60_init(const machine_t *model)
     machine_at_common_init(model);
     device_add(&ide_pci_2ch_device);
 
-    pci_init(PCI_CONFIG_TYPE_2);
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x01, PCI_CARD_SPECIAL, 0, 0, 0, 0);
     pci_register_slot(0x06, PCI_CARD_NORMAL, 3, 2, 1, 4);
     pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
     pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
+    device_add(&keyboard_ps2_ps1_pci_device);
-    device_add(&sio_zb_device);
+    device_add(&sio_device);
-    device_add(&i82091aa_device);
+    device_add(&fdc37c665_device);
     device_add(&intel_flash_bxt_ami_device);
 
     device_add(&i430lx_device);
 
     return ret;
 }
-#endif
 
 
 int
@@ -217,6 +215,7 @@ at_pb520r_get_device(void)
 }
 
 
+#if defined(DEV_BRANCH) && defined(USE_DELLS4)
 int
 machine_at_opti560l_init(const machine_t *model)
 {
@@ -248,7 +247,6 @@ machine_at_opti560l_init(const machine_t *model)
 }
 
 
-#if defined(DEV_BRANCH) && defined(USE_DELLXP60)
 int
 machine_at_dellxp60_init(const machine_t *model)	// Doesn't like the regular SMC 665
 {

src/machine/machine_table.c

@@ -241,12 +241,10 @@ const machine_t machines[] = {
         
     /* 430LX */
     { "[i430LX] IBM Ambra DP60 PCI",		"ambradp60",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  2,  128,   2, 127,	    machine_at_ambradp60_init, NULL			},
-#if defined(DEV_BRANCH) && defined(USE_VPP60)
     { "[i430LX] IBM PS/ValuePoint P60",		"valuepointp60",	MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  2,  128,   2, 127,	machine_at_valuepointp60_init, NULL			},
-#endif
     { "[i430LX] Intel Premiere/PCI",		"revenge",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  2,  128,   2, 127,	       machine_at_batman_init, NULL			},
+#if defined(DEV_BRANCH) && defined(USE_DELLS4)
     { "[i430LX] Dell OptiPlex 560L",		"opti560l",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  2,  128,   2, 127,	     machine_at_opti560l_init, NULL			},
-#if defined(DEV_BRANCH) && defined(USE_VPP60)
     { "[i430LX] Dell Dimension XPS P60",	"dellxp60",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  2,  128,   2, 127,	     machine_at_dellxp60_init, NULL			},
 #endif
     { "[i430LX] ASUS P/I-P5MP3",		"p5mp3",		MACHINE_TYPE_SOCKET4,		{{"Intel", cpus_Pentium5V},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  2,  192,   2, 127,	        machine_at_p5mp3_init, NULL			},

src/win/Makefile.mingw

@@ -66,9 +66,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef VECTRA54
   VECTRA54	:= y
  endif
- ifndef VPP60
-  VPP60		:= y
- endif
  ifndef SIEMENS
   SIEMENS	:= y
  endif
@@ -93,8 +90,8 @@ ifeq ($(DEV_BUILD), y)
  ifndef GUSMAX
   GUSMAX	:= y
  endif
- ifndef DELLXP60
+ ifndef DELLS4
-  DELLXP60		:= y
+  DELLS4	:= y
  endif
 else
  ifndef DEBUG
@@ -136,9 +133,6 @@ else
  ifndef VECTRA54
   VECTRA54	:= n
  endif
- ifndef VPP60
-  VPP60		:= n
- endif
  ifndef SIEMENS
   SIEMENS	:= n
  endif
@@ -163,8 +157,8 @@ else
  ifndef GUSMAX
   GUSMAX	:= n
  endif
- ifndef DELLXP60
+ ifndef DELLS4
-  DELLXP60		:= n
+  DELLS4	:= n
  endif
 endif
 
@@ -520,10 +514,6 @@ ifeq ($(VECTRA54), y)
 OPTS		+= -DUSE_VECTRA54
 endif
 
-ifeq ($(VPP60), y)
-OPTS		+= -DUSE_VPP60
-endif
-
 ifeq ($(SIEMENS), y)
 OPTS		+= -DUSE_SIEMENS
 endif
@@ -557,8 +547,8 @@ ifeq ($(GUSMAX), y)
 OPTS		+= -DUSE_GUSMAX
 endif
 
-ifeq ($(DELLXP60), y)
+ifeq ($(DELLS4), y)
-OPTS		+= -DUSE_DELLXP60
+OPTS		+= -DUSE_DELLS4
 endif
 
 endif