From 711bbff6adacac6365665636916f78c66be2cf87 Mon Sep 17 00:00:00 2001
From: Panagiotis <58827426+tiseno100@users.noreply.github.com>
Date: Wed, 21 Apr 2021 22:32:16 +0300
Subject: [PATCH] SiS 5598 uses Generic NVR at the moment

---
 src/chipset/sis_5598.c  |  2 +-
 src/include/86box/nvr.h |  1 -
 src/nvr_at.c            | 11 +----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/chipset/sis_5598.c b/src/chipset/sis_5598.c
index 95e6b2950..15fc44d89 100644
--- a/src/chipset/sis_5598.c
+++ b/src/chipset/sis_5598.c
@@ -930,7 +930,7 @@ sis_5598_init(const device_t *info)
 
     /* ACPI */
     dev->acpi = device_add(&acpi_sis_device);
-    dev->nvr = device_add(&sis_nvr_device);
+    dev->nvr = device_add(&at_nvr_device);
 
     /* DDMA */
     dev->ddma = device_add(&ddma_device);
diff --git a/src/include/86box/nvr.h b/src/include/86box/nvr.h
index 3203332f0..33b4c4310 100644
--- a/src/include/86box/nvr.h
+++ b/src/include/86box/nvr.h
@@ -93,7 +93,6 @@ extern const device_t ps_nvr_device;
 extern const device_t amstrad_nvr_device;
 extern const device_t ibmat_nvr_device;
 extern const device_t piix4_nvr_device;
-extern const device_t sis_nvr_device;
 extern const device_t ls486e_nvr_device;
 extern const device_t ami_apollo_nvr_device;
 extern const device_t via_nvr_device;
diff --git a/src/nvr_at.c b/src/nvr_at.c
index b1c502d29..ad7721d91 100644
--- a/src/nvr_at.c
+++ b/src/nvr_at.c
@@ -932,7 +932,7 @@ nvr_at_init(const device_t *info)
 	case 1:		/* standard AT */
 	case 5:		/* Lucky Star LS-486E */
 	case 6:		/* AMI Apollo */
-		if ((info->local == 9) || (info->local == 16))
+		if (info->local == 9)
 			local->flags |= FLAG_PIIX4;
 		else {
 			if ((info->local & 7) == 5)
@@ -1079,15 +1079,6 @@ const device_t piix4_nvr_device = {
     NULL
 };
 
-const device_t sis_nvr_device = {
-    "SiS PC/AT NVRAM",
-    DEVICE_ISA | DEVICE_AT,
-    11,
-    nvr_at_init, nvr_at_close, NULL,
-    { NULL }, nvr_at_speed_changed,
-    NULL
-};
-
 const device_t ls486e_nvr_device = {
     "Lucky Star LS-486E PC/AT NVRAM",
     DEVICE_ISA | DEVICE_AT,