From 1550a3a176a0aa4ff40de3c4b88c2f91331ab709 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 24 Mar 2020 02:50:24 +0100
Subject: [PATCH] Last minor fixes, it compile without problems now.

---
 src/network/net_pcnet.c | 11 +++--------
 src/scsi/scsi_spock.c   | 22 +++++++++++-----------
 src/video/vid_cl54xx.c  |  3 ++-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c
index 3d93a5e22..d2e20acd3 100644
--- a/src/network/net_pcnet.c
+++ b/src/network/net_pcnet.c
@@ -1027,13 +1027,6 @@ pcnetStop(nic_t *dev)
 }
 
 
-static void
-pcnetWakeupReceive(nic_t *dev)
-{
-    /* TODO: Wake up the thread here. */
-}
-
-
 /**
  * Poll Receive Descriptor Table Entry and cache the results in the appropriate registers.
  * Note: Once a descriptor belongs to the network card (this driver), it cannot be changed
@@ -2687,7 +2680,9 @@ pcnetTimerCallback(void *priv)
 {
     nic_t *dev = (nic_t *) priv;
     
-    pcnetlog("Timer Callback to RX\n");
+#ifdef ENABLE_PCNET_LOG
+    pcnetlog(3, "Timer Callback to RX\n");
+#endif
     pcnetPollRxTx(dev);
     
     timer_disable(&dev->poll_timer);
diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c
index 46df996c9..1a26b6b49 100644
--- a/src/scsi/scsi_spock.c
+++ b/src/scsi/scsi_spock.c
@@ -25,17 +25,17 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../io.h"
-#include "../timer.h"
-#include "../dma.h"
-#include "../pic.h"
-#include "../mca.h"
-#include "../mem.h"
-#include "../rom.h"
-#include "../device.h"
-#include "../nvr.h"
-#include "../plat.h"
+#include "86box.h"
+#include "86box_io.h"
+#include "timer.h"
+#include "dma.h"
+#include "pic.h"
+#include "mca.h"
+#include "mem.h"
+#include "rom.h"
+#include "device.h"
+#include "nvr.h"
+#include "plat.h"
 #include "scsi.h"
 #include "scsi_device.h"
 #include "scsi_spock.h"
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index ae575f2b7..4b3df6ddc 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -26,6 +26,7 @@
 #include "86box.h"
 #include "cpu.h"
 #include "86box_io.h"
+#include "mca.h"
 #include "mem.h"
 #include "pci.h"
 #include "rom.h"
@@ -3126,7 +3127,7 @@ static void
     if (gd54xx->mca) {
 	gd54xx->pos_regs[0] = 0x7b;
 	gd54xx->pos_regs[1] = 0x91;
-	mca_add(gd5428_mca_read, gd5428_mca_write, gd5428_mca_feedb, NULL, gd54xx);
+	mca_add(gd5428_mca_read, gd5428_mca_write, gd5428_mca_feedb, gd54xx);
     }
 
     return gd54xx;