Resolve merge conflicts master into devicesettings

platform/posix/darwin/include/dynamiclib.h

@@ -1,6 +1,6 @@
 #ifndef __DYNAMICLIB_DARWIN_H_
 #define __DYNAMICLIB_DARWIN_H_
 
-#define icsneo_dynamicLibraryLoad() dlopen("/home/paulywog/Code/icsneonext/build/libicsneoc.dylib", RTLD_LAZY)
+#define icsneo_dynamicLibraryLoad() dlopen("/Users/paulywog/Code/icsneonext/build/libicsneoc.dylib", RTLD_LAZY)
 
 #endif

platform/posix/include/ftdi.h

@@ -46,6 +46,6 @@ private:
 	FTDIDevice ftdiDevice;
 };
 
-};
+}
 
 #endif

platform/posix/include/stm32.h

@@ -26,6 +26,6 @@ private:
 	void writeTask();
 };
 
-};
+}
 
 #endif

platform/posix/stm32.cpp

@@ -273,8 +273,8 @@ void STM32::writeTask() {
 		if(!writeQueue.wait_dequeue_timed(writeOp, std::chrono::milliseconds(100)))
 			continue;
 
-		const auto writeSize = writeOp.bytes.size();
-		int actualWritten = ::write(fd, writeOp.bytes.data(), writeSize);
+		const ssize_t writeSize = (ssize_t)writeOp.bytes.size();
+		ssize_t actualWritten = ::write(fd, writeOp.bytes.data(), writeSize);
 		if(actualWritten != writeSize)
 			std::cout << "Failure to write " << writeSize << " bytes, wrote " << actualWritten << std::endl;
 	}

platform/windows/include/ftdi.h

@@ -11,6 +11,6 @@ public:
 	static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"serenum"); }
 };
 
-};
+}
 
 #endif

platform/windows/include/pcap.h

@@ -65,6 +65,6 @@ private:
 	};
 };
 
-};
+}
 
 #endif

platform/windows/include/registry.h

@@ -28,6 +28,6 @@ private:
 	};
 };
 
-};
+}
 
 #endif

platform/windows/include/stm32.h

@@ -11,6 +11,6 @@ public:
 	static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"usbser"); }
 };
 
-};
+}
 
 #endif

platform/windows/include/vcp.h

@@ -43,6 +43,6 @@ private:
 	void writeTask();
 };
 
-};
+}
 
 #endif

platform/windows/internal/include/pcapdll.h

@@ -4,12 +4,17 @@
 #include <Windows.h>
 #include <winsock2.h>
 #include <pcap.h>
+#include <memory>
 
 namespace icsneo {
 
 // Helper loader for the PCAP DLL
 class PCAPDLL {
 public:
+	// The first time we use the DLL we keep it in here and it won't get freed until the user unloads us (for speed reasons)
+	static std::shared_ptr<PCAPDLL> lazyLoadHolder;
+	static bool lazyLoaded;
+
 	// Functions
 	typedef int(__cdecl* PCAPFINDDEVICE)(char* source, struct pcap_rmtauth* auth, pcap_if_t** alldevs, char* errbuf);
 	typedef pcap_t*(__cdecl* PCAPOPEN)(const char* source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth* auth, char* errbuf);
@@ -48,6 +53,6 @@ private:
 	void closeDLL();
 };
 
-};
+}
 
 #endif

platform/windows/internal/pcapdll.cpp

@@ -2,7 +2,15 @@
 
 using namespace icsneo;
 
+std::shared_ptr<PCAPDLL> PCAPDLL::lazyLoadHolder;
+bool PCAPDLL::lazyLoaded = false;
+
 PCAPDLL::PCAPDLL() {
+	if(!lazyLoaded) {
+		lazyLoaded = true;
+		lazyLoadHolder = std::make_shared<PCAPDLL>();
+	}
+	
 	dll = LoadLibrary("wpcap.dll");
 
 	if(dll == NULL) {