From db3e75154cbbd3b55d83fd5ff3ed9ef0582bd76b Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 15 Oct 2019 08:47:43 +0200 Subject: [PATCH] MacOS compatible AMBE engine --- sdrbase/ambe/ambeengine.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sdrbase/ambe/ambeengine.cpp b/sdrbase/ambe/ambeengine.cpp index c97e0895c..03e4eec63 100644 --- a/sdrbase/ambe/ambeengine.cpp +++ b/sdrbase/ambe/ambeengine.cpp @@ -16,8 +16,10 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#ifndef __APPLE__ #include #include +#endif #ifndef _MSC_VER #include @@ -25,13 +27,11 @@ #include #endif -#ifndef __WINDOWS__ +#if !defined(__WINDOWS__) && !defined(__APPLE__) #include #include -#ifndef __APPLE__ #include #endif -#endif #include #include @@ -51,7 +51,7 @@ AMBEEngine::~AMBEEngine() qDebug("AMBEEngine::~AMBEEngine: %lu controllers", m_controllers.size()); } -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) void AMBEEngine::getComList() { m_comList.clear(); @@ -69,6 +69,15 @@ void AMBEEngine::getComList() // Do not activate serial support at all for windows void AMBEEngine::scan(std::vector& ambeDevices) { + (void) ambeDevices; +} +#elif defined(__APPLE__) +void AMBEEngine::getComList() +{ +} +void AMBEEngine::scan(std::vector& ambeDevices) +{ + (void) ambeDevices; } #else void AMBEEngine::getComList() @@ -108,9 +117,9 @@ void AMBEEngine::getComList() // serial8250-devices must be probe to check for validity probe_serial8250_comports(m_comList, m_comList8250); } -#endif // not Windows +#endif // not Windows nor Apple -#ifndef __WINDOWS__ +#if !defined(__WINDOWS__) && !defined(__APPLE__) void AMBEEngine::register_comport( std::vector& comList, std::vector& comList8250, @@ -209,7 +218,7 @@ void AMBEEngine::scan(std::vector& ambeDevices) ++it; } } -#endif // not Windows +#endif // not Windows nor Apple bool AMBEEngine::registerController(const std::string& deviceRef) {