ngscopeclient · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020
diff --git a/scopehal/CMakeLists.txt b/scopehal/CMakeLists.txt
@@ -3,6 +3,14 @@ link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 find_library(LXI_LIB lxi)
 
+if(LXI_LIB)
+	set(HAS_LXI true)
+	set(LXI_LIBRARIES ${LXI_LIB})
+else()
+	set(HAS_LXI false)
+	set(LXI_LIBRARIES "")
+endif()
+
 set(SCOPEHAL_SOURCES
 	base64.cpp
 	scopehal.cpp
@@ -41,9 +49,13 @@ set(SCOPEHAL_SOURCES
 
 add_library(scopehal SHARED
 	${SCOPEHAL_SOURCES})
-target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget yaml-cpp ${LXI_LIB})
+target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget yaml-cpp ${LXI_LIBRARIES})
 
 target_include_directories(scopehal
 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
+if(${HAS_LXI})
+	target_compile_definitions(scopehal PUBLIC HAS_LXI)
+endif()
+
 install(TARGETS scopehal LIBRARY DESTINATION /usr/lib)
diff --git a/scopehal/LeCroyOscilloscope.cpp b/scopehal/LeCroyOscilloscope.cpp
@@ -27,6 +27,8 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
+#ifndef _WIN32
+
 #include "scopehal.h"
 #include "LeCroyOscilloscope.h"
 #include "ProtocolDecoder.h"
@@ -2153,3 +2155,5 @@ int64_t LeCroyOscilloscope::GetDeskewForChannel(size_t channel)
 
 	return skew_ps;
 }
+
+#endif
diff --git a/scopehal/LeCroyOscilloscope.h b/scopehal/LeCroyOscilloscope.h
@@ -27,6 +27,8 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
+#ifndef _WIN32
+
 #ifndef LeCroyOscilloscope_h
 #define LeCroyOscilloscope_h
 
@@ -243,3 +245,5 @@ class LeCroyOscilloscope
 };
 
 #endif
+
+#endif
diff --git a/scopehal/RigolOscilloscope.cpp b/scopehal/RigolOscilloscope.cpp
@@ -27,6 +27,11 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
+#ifdef _WIN32
+#include <chrono>
+#include <thread>
+#endif
+
 #include "scopehal.h"
 #include "RigolOscilloscope.h"
 
@@ -463,7 +468,11 @@ void RigolOscilloscope::ResetTriggerConditions()
 Oscilloscope::TriggerMode RigolOscilloscope::PollTrigger()
 {
 	//workaround for high latency links to let the UI thread get the mutex
+#ifdef _WIN32
+	std::this_thread::sleep_for(std::chrono::microseconds(1000));
+#else
 	usleep(1000);
+#endif
 
 	lock_guard<recursive_mutex> lock(m_mutex);
 
@@ -502,7 +511,11 @@ bool RigolOscilloscope::AcquireData(bool toQueue)
 	bool enabled[4] = {true, true, true, true};
 
 	//workaround for high latency links to let the UI thread get the mutex
+#ifdef _WIN32
+	std::this_thread::sleep_for(std::chrono::microseconds(1000));
+#else
 	usleep(1000);
+#endif
 
 	lock_guard<recursive_mutex> lock(m_mutex);
 	LogIndenter li;

diff --git a/scopehal/SCPILxiTransport.cpp b/scopehal/SCPILxiTransport.cpp
@@ -32,6 +32,8 @@
 	@author Tom Verbeure 
 	@brief Implementation of SCPILxiTransport
  */
+
+#ifdef HAS_LXI
 
 extern "C"
 {
@@ -222,3 +224,5 @@ bool SCPILxiTransport::IsCommandBatchingSupported()
 {
 	return false;
 }
+
+#endif
diff --git a/scopehal/SCPILxiTransport.h b/scopehal/SCPILxiTransport.h
@@ -33,6 +33,8 @@
 	@brief Declaration of SCPILxiTransport
  */
 
+#ifdef HAS_LXI
+
 #ifndef SCPILxiTransport_h
 #define SCPILxiTransport_h
 
@@ -78,3 +80,5 @@ class SCPILxiTransport : public SCPITransport
 };
 
 #endif
+
+#endif
diff --git a/scopehal/SiglentSCPIOscilloscope.cpp b/scopehal/SiglentSCPIOscilloscope.cpp
@@ -27,6 +27,8 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
+#ifndef _WIN32
+
 #include "scopehal.h"
 #include "SiglentSCPIOscilloscope.h"
 #include "ProtocolDecoder.h"
@@ -398,3 +400,5 @@ bool SiglentSCPIOscilloscope::AcquireData(bool toQueue)
 
 	return true;
 }
+
+#endif
diff --git a/scopehal/SiglentSCPIOscilloscope.h b/scopehal/SiglentSCPIOscilloscope.h
@@ -27,6 +27,8 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
+#ifndef _WIN32
+
 #ifndef SiglentSCPIOscilloscope_h
 #define SiglentSCPIOscilloscope_h
 
@@ -204,3 +206,5 @@ struct SiglentWaveformDesc_t
 };
 
 #endif
+
+#endif
diff --git a/scopehal/scopehal.cpp b/scopehal/scopehal.cpp
@@ -42,7 +42,10 @@
 #include "RohdeSchwarzOscilloscope.h"
 #include "SiglentSCPIOscilloscope.h"
 #include <libgen.h>
+
+#ifndef _WIN32
 #include <dlfcn.h>
+#endif
 
 using namespace std;
 
@@ -52,9 +55,12 @@ using namespace std;
 void TransportStaticInit()
 {
 	AddTransportClass(SCPISocketTransport);
-	AddTransportClass(SCPILxiTransport);
 	AddTransportClass(SCPITMCTransport);
 	AddTransportClass(VICPSocketTransport);
+
+#ifdef HAS_LXI
+	AddTransportClass(SCPILxiTransport);
+#endif
 }
 
 /**
@@ -65,10 +71,13 @@ void DriverStaticInit()
 	AddDriverClass(AgilentOscilloscope);
 	AddDriverClass(AntikernelLabsOscilloscope);
 	AddDriverClass(AntikernelLogicAnalyzer);
-	AddDriverClass(LeCroyOscilloscope);
 	AddDriverClass(RigolOscilloscope);
 	AddDriverClass(RohdeSchwarzOscilloscope);
+
+#ifndef _WIN32
+	AddDriverClass(LeCroyOscilloscope);
 	AddDriverClass(SiglentSCPIOscilloscope);
+#endif
 }
 
 string GetDefaultChannelColor(int i)
@@ -109,6 +118,7 @@ uint64_t ConvertVectorSignalToScalar(vector<bool> bits)
  */
 void InitializePlugins()
 {
+#ifndef _WIN32
 	char tmp[1024];
 	vector<string> search_dirs;
 	search_dirs.push_back("/usr/lib/scopehal/plugins/");
@@ -157,4 +167,5 @@ void InitializePlugins()
 
 		closedir(hdir);
 	}
+#endif
 }
diff --git a/scopeprotocols/CMakeLists.txt b/scopeprotocols/CMakeLists.txt
@@ -68,6 +68,7 @@ add_library(scopeprotocols SHARED
 	${SCOPEPROTOCOLS_SOURCES})
 
 target_link_libraries(scopeprotocols
+	scopehal
 	${LIBFFTS_LIBRARIES})
 
 target_include_directories(scopeprotocols

diff --git a/scopeprotocols/FFTDecoder.cpp b/scopeprotocols/FFTDecoder.cpp
@@ -31,6 +31,10 @@
 #include "FFTDecoder.h"
 #include <ffts.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -125,12 +129,23 @@ void FFTDecoder::Refresh()
 	//TODO: handle non-uniform sample rates
 	float* rdin;
 	size_t insize = npoints * sizeof(float);
+
+#ifdef _WIN32
+	rdin = (float*)_aligned_malloc(insize, 32);
+#else
 	posix_memalign((void**)&rdin, 32, insize);
+#endif
+
 	memcpy(rdin, &din->m_samples[0], insize);
 
 	float* rdout;
 	const size_t nouts = npoints/2 + 1;
+
+#ifdef _WIN32
+	rdout = (float*)_aligned_malloc(2 * nouts * sizeof(float), 32);
+#else	
 	posix_memalign((void**)&rdout, 32, 2 * nouts * sizeof(float));
+#endif 
 
 	//Calculate the FFT
 	auto plan = ffts_init_1d_real(npoints, FFTS_FORWARD);
@@ -175,6 +190,11 @@ void FFTDecoder::Refresh()
 	SetData(cap);
 
 	//Clean up
+#ifdef _WIN32
+	_aligned_free(rdin);
+	_aligned_free(rdout);
+#else
 	free(rdin);
 	free(rdout);
+#endif
 }
diff --git a/scopeprotocols/SincInterpolationDecoder.cpp b/scopeprotocols/SincInterpolationDecoder.cpp
@@ -27,6 +27,11 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
+#ifdef _WIN32
+#define _USE_MATH_DEFINES
+#include <cmath>
+#endif
+
 #include "../scopehal/scopehal.h"
 #include "SincInterpolationDecoder.h"