From 3ed2b1024128191311af0c27f16830ea51d02eac Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 11 Aug 2022 22:03:08 -0400
Subject: [PATCH] Fixes

---
 src/device/smbus_piix4.c |  4 ++--
 src/sio/sio_it8702.c     | 14 ++++++++------
 src/sio/sio_nsc366.c     |  6 ++++--
 src/win/Makefile.mingw   |  3 ++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/device/smbus_piix4.c b/src/device/smbus_piix4.c
index 2bf5fc5b4..7c5820ccc 100644
--- a/src/device/smbus_piix4.c
+++ b/src/device/smbus_piix4.c
@@ -344,10 +344,10 @@ unknown_protocol:
 			}
 
 			/* Finish transfer. */
-            if (dev->local == SMBUS_INTEL_ICH2) // ICH2 SMBus specific. Transfer on Byte command doesn't stop till their specific points.
+            if (dev->local == SMBUS_INTEL_ICH2) { // ICH2 SMBus specific. Transfer on Byte command doesn't stop till their specific points.
                 if (!dev->byte_rw)
                     i2c_stop(i2c_smbus, smbus_addr);
-            else
+            } else
                 i2c_stop(i2c_smbus, smbus_addr);
 		}
 		break;
diff --git a/src/sio/sio_it8702.c b/src/sio/sio_it8702.c
index a96a99e04..8c2815585 100644
--- a/src/sio/sio_it8702.c
+++ b/src/sio/sio_it8702.c
@@ -268,14 +268,13 @@ it8702_read(uint16_t addr, void *priv)
 {
     it8702_t *dev = (it8702_t *) priv;
 
-    if(addr == 0x2e)
+    if(addr == 0x2e) {
         return dev->index;
-    else if(addr == 0x2f) {
-        if(dev->index == 0x02) /* The Configure Control register is Write Only */
+    } else if(addr == 0x2f) {
+        if(dev->index == 0x02) { /* The Configure Control register is Write Only */
             return 0xff;
-        else
-            switch(dev->index)
-            {
+		} else {
+            switch(dev->index) {
                 case 0x07:
                     return dev->ldn;
                 
@@ -315,7 +314,10 @@ it8702_read(uint16_t addr, void *priv)
                 default:
                     return 0xff;
             }
+        }
     }
+
+    return 0xff;
 }
 
 
diff --git a/src/sio/sio_nsc366.c b/src/sio/sio_nsc366.c
index fcba16954..352b67d0a 100644
--- a/src/sio/sio_nsc366.c
+++ b/src/sio/sio_nsc366.c
@@ -221,12 +221,14 @@ nsc366_write(uint16_t addr, uint8_t val, void *priv)
             case 0x20 ... 0x2d:
                 switch (dev->index - 0x20) {
                     case 0x01:
-                        if (!dev->siofc_lock)
+                        if (!dev->siofc_lock) {
                             if (val & 0x80) {
                                 dev->sio_config[dev->index - 0x20] = val | 0x80;
                                 dev->siofc_lock = 1;
-                            } else
+                            } else {
                                 dev->sio_config[dev->index - 0x20] = val;
+                            }
+                        }
                         break;
 
                     case 0x02:
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 7f4243c2d..a17adc9d5 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -539,7 +539,8 @@ MAINOBJ		:= 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma
 		   usb.o device.o nvr.o nvr_at.o nvr_ps2.o machine_status.o \
 		   $(VNCOBJ)
 
-MEMOBJ		:= catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o rom.o smram.o spd.o sst_flash.o
+MEMOBJ		:= catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o rom.o smram.o spd.o sst_flash.o \
+               815ep_spd_hack.o
 
 CPUOBJ		:= $(DYNARECOBJ) \
 		    $(CGTOBJ) \