Merge branch 'master' of https://github.com/FujiNetWIFI/fujinet-platf…

…ormio
FujiNetWIFI · Dec 14, 2023 · 5013b50 · 5013b50
2 parents 22d5e2d + 3e54bdb
commit 5013b50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/lib/bus/iec/protocol/jiffydos.cpp b/lib/bus/iec/protocol/jiffydos.cpp
@@ -1,3 +1,4 @@
+#ifdef BUILD_IEC
 // Meatloaf - A Commodore 64/128 multi-device emulator
 // https://github.com/idolpx/meatloaf
 // Copyright(C) 2020 James Johnston
@@ -222,3 +223,5 @@ bool JiffyDOS::sendByte ( uint8_t data, bool signalEOI )
 
     return true;
 } // sendByte
+
+#endif /* BUILD_IEC*/
diff --git a/lib/device/drivewire/fuji.cpp b/lib/device/drivewire/fuji.cpp
@@ -1638,7 +1638,7 @@ void drivewireFuji::process()
     switch (c)
     {
     case FUJICMD_GET_SCAN_RESULT:
-        net_scan_result;
+        net_scan_result();
         break;
     case FUJICMD_SCAN_NETWORKS:
         net_scan_networks();

diff --git a/lib/meatloaf/wrappers/iec_buffer.cpp b/lib/meatloaf/wrappers/iec_buffer.cpp
@@ -1,3 +1,4 @@
+#ifdef BUILD_IEC
 #include "iec_buffer.h"
 
 oiecstream iecStream;
@@ -126,3 +127,4 @@ void oiecstream::putUtf8(U8Char* codePoint) {
 
     //     (*this) << converted;
     // }
+#endif /* BUILD_IEC */
diff --git a/lib/meatloaf/wrappers/iec_buffer.h b/lib/meatloaf/wrappers/iec_buffer.h
@@ -1,3 +1,4 @@
+#ifdef BUILD_IEC
 #ifndef MEATLOAF_WRAPPER_IEC_BUFFER
 #define MEATLOAF_WRAPPER_IEC_BUFFER
 
@@ -87,3 +88,4 @@ class oiecstream : private std::filebuf, public std::ostream {
 extern oiecstream iecStream;
 
 #endif /* MEATLOAF_WRAPPER_IEC_BUFFER */
+#endif /* BUILD_IEC */