X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=b05e644aff3b616f66a13db3fab75f2aa2d279dc;hb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;hp=160dbb4d52e777069807db97b30719583499b63b;hpb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;p=libsigrok.git
diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 160dbb4d..b05e644a 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -29,7 +30,7 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "dso.h"
@@ -269,7 +270,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
GSList *l, *devices, *conn_devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int ret, i, j;
+ int i, j;
const char *conn;
char connection_id[64];
@@ -307,11 +308,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
continue;
}
- if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
@@ -394,7 +391,7 @@ static int dev_open(struct sr_dev_inst *sdi)
timediff_ms = timediff_us / 1000;
sr_spew("Waited %" PRIi64 " ms.", timediff_ms);
}
- sr_info("Device came back after %d ms.", timediff_ms);
+ sr_info("Device came back after %" PRIi64 " ms.", timediff_ms);
} else {
err = dso_open(sdi);
}
@@ -758,6 +755,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
}
}
sr_session_send(devc->cb_data, &packet);
+ g_free(analog.data);
}
/*