sr: hantek-dso: Use portable g_ntohs() function.

The ntohs() from <arpa/inet.h> is not available on MinGW/Windows. There
are ways to work around this, but as we use glib already, using g_ntohs()
is the best option anyway.

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index c571caf89ee92d258886ea547b8d703654fa023f..1091ea9008c6956ae816239f2f102d588b733be3 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <sys/time.h>
 #include <inttypes.h>
-#include <arpa/inet.h>
 #include <glib.h>
 #include <libusb.h>
 #include "sigrok.h"

diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c
index 8c6a6000f1a0776d2a5fa3db9e8d337124795c6e..73dd8eb31492369adf4e1303ab1bd3d18361c0fa 100644 (file)
--- a/hardware/hantek-dso/dso.c
+++ b/hardware/hantek-dso/dso.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
-#include <arpa/inet.h>
 
 extern libusb_context *usb_context;
 extern GSList *dev_insts;
@@ -223,8 +222,8 @@ static int get_channel_offsets(struct context *ctx)
         */
        for (chan = 0; chan < 2; chan++) {
                for (v = 0; v < 9; v++) {
-                       ctx->channel_levels[chan][v][0] = ntohs(ctx->channel_levels[chan][v][0]);
-                       ctx->channel_levels[chan][v][1] = ntohs(ctx->channel_levels[chan][v][1]);
+                       ctx->channel_levels[chan][v][0] = g_ntohs(ctx->channel_levels[chan][v][0]);
+                       ctx->channel_levels[chan][v][1] = g_ntohs(ctx->channel_levels[chan][v][1]);
                }
        }