Clean up for Windows

Author: zuckschwerdt

.gitignore

@@ -1 +1,5 @@
-build
+# Ignore CMake generated output
+/build
+*~
+*.swp
+/.vscode

Settings.cpp

@@ -27,6 +27,11 @@
 #include <algorithm>
 #include <cstring>
 
+#ifdef _MSC_VER
+    #include <BaseTsd.h>
+    typedef SSIZE_T ssize_t;
+#endif
+
 #define DEFAULT_PORT "1234"
 
 SoapyRTLTCP::SoapyRTLTCP(const SoapySDR::Kwargs &args):
@@ -113,16 +118,16 @@ int SoapyRTLTCP::recvHeader()
         // worst case at 100ms for 12 bytes is 1.2 secs
         struct timeval tv = {0, 100000};
 
-        int ret = select(serverSocket + 1, &readfds, NULL, NULL, &tv);
-        if (ret)
+        SOCKET ret = select(serverSocket + 1, &readfds, NULL, NULL, &tv);
+        if (ret != INVALID_SOCKET)
         {
-            ssize_t received = recv(serverSocket, (char *)&cmd + (sizeof(cmd) - left), left, 0);
+            ssize_t received = recv(serverSocket, &cmd[0] + (sizeof(cmd) - left), left, 0);
             if (received < 0)
             {
                 SoapySDR_logf(SOAPY_SDR_DEBUG, "server recv error");
                 break;
             }
-            left -= received;
+            left -= (int)received;
         }
     }
 
@@ -150,16 +155,16 @@ int SoapyRTLTCP::sendCommand(rtltcpCommand command, unsigned int param)
         // worst case at 100ms for 5 bytes is 0.5 secs
         struct timeval tv = {0, 100000};
 
-        int ret = select(serverSocket + 1, NULL, &writefds, NULL, &tv);
-        if (ret)
+        SOCKET ret = select(serverSocket + 1, NULL, &writefds, NULL, &tv);
+        if (ret != INVALID_SOCKET)
         {
             ssize_t sent = send(serverSocket, (char *)&cmd + (sizeof(cmd) - left), left, 0);
             if (sent < 0)
             {
                 SoapySDR_logf(SOAPY_SDR_WARNING, "RTL-TCP server send error");
                 break;
             }
-            left -= sent;
+            left -= (int)sent; // this is sound since sent must be small
         }
     }
 
@@ -233,7 +238,7 @@ SOCKET SoapyRTLTCP::connectToServer(char const *serverName, char const *defaultP
     }
 
     struct sockaddr_storage addr = {};
-    unsigned addr_len            = sizeof(addr);
+    socklen_t addr_len           = sizeof(addr);
     SOCKET sock = INVALID_SOCKET;
     for (res = res0; res; res = res->ai_next)
     {
@@ -514,7 +519,7 @@ double SoapyRTLTCP::getGain(const int /*direction*/, const size_t /*channel*/, c
         }
         if (tunerType == RTLSDR_TUNER_E4000)
         {
-            return getE4000Gain(stage, IFGain[stage - 1]);
+            return getE4000Gain(stage, (int)IFGain[stage - 1]);
         }
 
         return IFGain[stage - 1];
@@ -940,6 +945,7 @@ std::vector<int> SoapyRTLTCP::rtlTunerGains(rtlsdr_tuner tunerType)
     case RTLSDR_TUNER_R820T:
     case RTLSDR_TUNER_R828D:
         return r82xx_gains;
+    case RTLSDR_TUNER_UNKNOWN:
     default:
         return unknown_gains;
 	}

SoapyRTLTCP.hpp

@@ -284,7 +284,8 @@ class SoapyRTLTCP : public SoapySDR::Device
     rtltcpRXFormat rxFormat;
     rtlsdr_tuner tunerType;
     int tunerGainCount;
-    uint32_t sampleRate, centerFrequency, bandwidth;
+    uint32_t sampleRate, centerFrequency;
+    double bandwidth;
     int ppm, directSamplingMode;
     bool iqSwap, gainMode, offsetMode, digitalAGC, biasTee;
     double IFGain[6], tunerGain;

Streaming.cpp

@@ -30,6 +30,11 @@
 #include <climits>   //SHRT_MAX
 #include <cstring>   // memcpy
 
+#ifdef _MSC_VER
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 std::vector<std::string> SoapyRTLTCP::getStreamFormats(const int /*direction*/, const size_t /*channel*/) const
 {
     std::vector<std::string> formats;
@@ -99,7 +104,7 @@ void SoapyRTLTCP::net_recv_operation(void)
         }
 
         // Block on recv
-        ssize_t received = recv(serverSocket, _buf + tail, chunk_size, 0);
+        ssize_t received = recv(serverSocket, (char *)_buf + tail, (int)chunk_size, 0);
         if (received <= 0)
         {
             SoapySDR_logf(SOAPY_SDR_DEBUG, "RTL-TCP server recv end");
@@ -168,7 +173,7 @@ SoapySDR::Stream *SoapyRTLTCP::setupStream(
         // Create lookup tables
         for (unsigned int i = 0; i <= 0xffff; i++)
         {
-#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#if (__BYTE_ORDER__ == __LITTLE_ENDIAN__)
             float re = ((i & 0xff) - 127.4f) * (1.0f / 128.0f);
             float im = ((i >> 8) - 127.4f) * (1.0f / 128.0f);
 #else
@@ -388,5 +393,5 @@ int SoapyRTLTCP::readStream(
     if (_buf_head != _buf_tail)
         flags |= SOAPY_SDR_MORE_FRAGMENTS;
 
-    return returnedElems;
+    return (int)returnedElems; // this conversion is sound since _buf is small
 }