Removed the "PS/1 Model 2133" Super I/O chip as it has been identified as a National Semiconductors PC87332 on a different set of ports, the PS/1 Model 2133 now uses that.

src/include/86box/sio.h

@@ -29,6 +29,7 @@ extern const device_t	pc87306_device;
 extern const device_t	pc87307_device;
 extern const device_t	pc87309_device;
 extern const device_t	pc87332_device;
+extern const device_t	pc87332_ps1_device;
 extern const device_t	pc97307_device;
 extern const device_t 	ps1_m2133_sio;
 extern const device_t	sio_detect_device;

src/machine/m_ps1.c

@@ -574,7 +574,7 @@ machine_ps1_m2133_init(const machine_t *model)
     device_add(&fdc_at_device);
     device_add(&ide_isa_device);
     device_add(&vl82c480_device);
-    device_add(&ps1_m2133_sio);
+    device_add(&pc87332_ps1_device);
 
     nmi_mask = 0x80;
 

src/sio/sio_pc87332.c

@@ -41,7 +41,6 @@ typedef struct {
     int cur_reg;
     fdc_t *fdc;
     serial_t *uart[2];
-    nvr_t *nvr;
 } pc87332_t;
 
 
@@ -292,12 +291,15 @@ pc87332_init(const device_t *info)
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
-    // dev->nvr = device_add(&piix4_nvr_device);
-
     pc87332_reset(dev);
 
-    io_sethandler(0x02e, 0x0002,
+    if (info->local == 1) {
-		  pc87332_read, NULL, NULL, pc87332_write, NULL, NULL, dev);
+	io_sethandler(0x398, 0x0002,
+		      pc87332_read, NULL, NULL, pc87332_write, NULL, NULL, dev);
+    } else {
+	io_sethandler(0x02e, 0x0002,
+		      pc87332_read, NULL, NULL, pc87332_write, NULL, NULL, dev);
+    }
 
     return dev;
 }
@@ -311,3 +313,13 @@ const device_t pc87332_device = {
     NULL, NULL, NULL,
     NULL
 };
+
+
+const device_t pc87332_ps1_device = {
+    "National Semiconductor PC87332 Super I/O (IBM PS/1 Model 2133 EMEA 451)",
+    0,
+    1,
+    pc87332_init, pc87332_close, NULL,
+    NULL, NULL, NULL,
+    NULL
+};

src/sio/sio_ps1_m2133.c

@@ -1,148 +0,0 @@
-/*
- * 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.
- *
- *		Implementation of the chipset used by the IBM PS/1 Model 2133 EMEA 451
- *		whose name is currently unknown.
- *
- * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
- *
- *		Copyright 2020 Sarah Walker.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/sio.h>
-
-
-typedef struct ps1_m2133_sio_t
-{
-        int idx;
-        uint8_t regs[3];
-	serial_t *uart[2];
-} ps1_m2133_sio_t;
-
-static uint16_t ps1_lpt_io[4] = {0x378, 0x3bc, 0x278, 0x378};
-static uint16_t ps1_com_io[4] = {0x3f8, 0x2f8, 0x3e8, 0x2e8};
-
-static uint8_t 
-ps1_m2133_read(uint16_t port, void *p)
-{
-	ps1_m2133_sio_t *dev = (ps1_m2133_sio_t *)p;
-	uint8_t ret = 0xff;
-
-	switch (port) {
-		case 0x398:
-			ret = dev->idx;
-			break;
-                
-		case 0x399:
-			if (dev->idx < 3)
-				ret = dev->regs[dev->idx];
-			break;
-	}
-	return ret;
-}
-
-static void 
-ps1_m2133_write(uint16_t port, uint8_t val, void *p)
-{
-	ps1_m2133_sio_t *dev = (ps1_m2133_sio_t *)p;
-	uint16_t lpt_addr;
-
-	switch (port) {
-		case 0x398:
-			dev->idx = val;
-			break;
-		
-		case 0x399:
-			if (dev->idx < 3) {
-				dev->regs[dev->idx] = val;
-				
-				lpt1_remove();
-				lpt2_remove();
-				serial_remove(dev->uart[0]);
-				serial_remove(dev->uart[1]);
-
-				if (dev->regs[0] & 1) {
-					lpt_addr = ps1_lpt_io[dev->regs[1] & 3];
-					
-					lpt1_init(lpt_addr);
-					if ((lpt_addr == 0x378) || (lpt_addr == 0x3bc)) {
-						if (((dev->regs[1] & 3) == 3) && (lpt_addr == 0x378)) {
-							lpt1_irq(5);
-						} else {
-							lpt1_irq(7);
-						}
-					} else if (lpt_addr == 0x278) {
-						lpt1_irq(5);
-					}
-				}
-				
-				if (dev->regs[0] & 2)
-					serial_setup(dev->uart[0], ps1_com_io[(dev->regs[1] >> 2) & 3], 4);
-				if (dev->regs[0] & 4)
-					serial_setup(dev->uart[1], ps1_com_io[(dev->regs[1] >> 4) & 3], 3);
-			}
-			break;
-	}
-}
-
-static void
-ps1_m2133_reset(ps1_m2133_sio_t *dev)
-{
-	serial_remove(dev->uart[0]);
-	serial_setup(dev->uart[0], SERIAL1_ADDR, SERIAL1_IRQ);
-
-	serial_remove(dev->uart[1]);
-	serial_setup(dev->uart[1], SERIAL2_ADDR, SERIAL2_IRQ);
-	
-	lpt1_remove();
-	lpt1_init(0x378);
-	lpt1_irq(7);
-}
-
-static void *
-ps1_m2133_init(const device_t *info)
-{
-	ps1_m2133_sio_t *dev = (ps1_m2133_sio_t *) malloc(sizeof(ps1_m2133_sio_t));
-	memset(dev, 0, sizeof(ps1_m2133_sio_t));
-
-	dev->uart[0] = device_add_inst(&ns16450_device, 1);
-	dev->uart[1] = device_add_inst(&ns16450_device, 2);	
-	
-        io_sethandler(0x0398, 0x0002, ps1_m2133_read, NULL, NULL, ps1_m2133_write, NULL, NULL, dev);
-	
-	ps1_m2133_reset(dev);
-	
-	return dev;
-}
-
-static void
-ps1_m2133_close(void *p)
-{
-	ps1_m2133_sio_t *dev = (ps1_m2133_sio_t *)p;
-
-	free(dev);
-}
-
-const device_t ps1_m2133_sio = {
-	"IBM PS/1 Model 2133 EMEA 451 Super I/O",
-	0,
-	0,
-	ps1_m2133_init, ps1_m2133_close, NULL,
-	NULL, NULL, NULL,
-	NULL
-};

src/win/Makefile.mingw

@@ -595,7 +595,6 @@ SIOOBJ		:= sio_acc3221.o \
 		    sio_fdc37c661.o sio_fdc37c66x.o sio_fdc37c669.o \
 		    sio_fdc37c93x.o \
 		    sio_pc87306.o sio_pc87307.o sio_pc87309.o sio_pc87332.o \
-		    sio_ps1_m2133.o \
 		    sio_w83787f.o \
 		    sio_w83877f.o sio_w83977f.o \
 		    sio_um8669f.o