From 4fb6e3aaacdcb17a104397b2722887a0aa6381ae Mon Sep 17 00:00:00 2001
From: win2kgamer <47463859+win2kgamer@users.noreply.github.com>
Date: Sun, 28 Sep 2025 22:56:46 -0500
Subject: [PATCH] Fix warnings in vl82c59x.c and m_at_socket4_5.c (#6249)

---
 src/chipset/vl82c59x.c       | 12 ++++++------
 src/machine/m_at_socket4_5.c |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/chipset/vl82c59x.c b/src/chipset/vl82c59x.c
index 0ed6bb0db..468978718 100644
--- a/src/chipset/vl82c59x.c
+++ b/src/chipset/vl82c59x.c
@@ -139,19 +139,19 @@ vl82c59x_smram(vl82c59x_t *dev)
     /* A/B region SMRAM seems to not be controlled by 591 reg 0x7C/SMRAM enable */
     /* Dell Dimension BIOS breaks if A0000 region is controlled by SMRAM enable */
     if (dev->pci_conf[0x64] & 0x55) {
-        smram_enable(dev->smram[1], 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0x64] & 0xAA, dev->pci_conf[0x64] & 0x55);
+        smram_enable(dev->smram[0], 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0x64] & 0xAA, dev->pci_conf[0x64] & 0x55);
     }
     if (dev->pci_conf[0x65] & 0x55) {
-        smram_enable(dev->smram[2], 0x000b0000, 0x000b0000, 0x10000, dev->pci_conf[0x65] & 0xAA, dev->pci_conf[0x65] & 0x55);
+        smram_enable(dev->smram[1], 0x000b0000, 0x000b0000, 0x10000, dev->pci_conf[0x65] & 0xAA, dev->pci_conf[0x65] & 0x55);
     }
 
     /* Handle E region SMRAM */
     if (dev->pci_conf[0x7C] & 0x80) {
         if (dev->pci_conf[0x68] & 0x05) {
-            smram_enable(dev->smram[3], 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0x68] & 0x0A, dev->pci_conf[0x68] & 0x05);
+            smram_enable(dev->smram[2], 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0x68] & 0x0A, dev->pci_conf[0x68] & 0x05);
         }
         if (dev->pci_conf[0x68] & 0x50) {
-            smram_enable(dev->smram[4], 0x000e8000, 0x000e8000, 0x8000, dev->pci_conf[0x68] & 0xA0, dev->pci_conf[0x68] & 0x50);
+            smram_enable(dev->smram[3], 0x000e8000, 0x000e8000, 0x8000, dev->pci_conf[0x68] & 0xA0, dev->pci_conf[0x68] & 0x50);
         }
     }
 
@@ -542,10 +542,10 @@ vl82c59x_close(void *priv)
 {
     vl82c59x_t *dev = (vl82c59x_t *) priv;
 
+    smram_del(dev->smram[0]);
     smram_del(dev->smram[1]);
     smram_del(dev->smram[2]);
     smram_del(dev->smram[3]);
-    smram_del(dev->smram[4]);
 
     if (dev->log != NULL) {
         log_close(dev->log);
@@ -577,10 +577,10 @@ vl82c59x_init(UNUSED(const device_t *info))
     /* NVR */
     dev->nvr = device_add(&at_nvr_device);
 
+    dev->smram[0] = smram_add();
     dev->smram[1] = smram_add();
     dev->smram[2] = smram_add();
     dev->smram[3] = smram_add();
-    dev->smram[4] = smram_add();
 
     vl82c59x_reset(dev);
 
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index ccaf06050..f5b7ae87c 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -101,4 +101,5 @@ machine_at_celebris5xx_init(const machine_t *model)
     if (gfxcard[0] == VID_INTERNAL)
         device_add(machine_get_vid_device(machine));
 
+    return ret;
 }