X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=5fe431d5be7c468f219ce8b81b32431fbd1b88b9;hb=7fb90f94d62597224509472906fd8a33c3f3a1d2;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..5fe431d5 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 <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -29,7 +30,7 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "dso.h"
 
@@ -87,24 +88,24 @@ static const struct dso_profile dev_profiles[] = {
 	{	0x04b4, 0x2090, 0x04b5, 0x2090,
 		"Hantek", "DSO-2090",
 		buffersizes_32k,
-		FIRMWARE_DIR "/hantek-dso-2090.fw" },
+		"hantek-dso-2090.fw" },
 	{	0x04b4, 0x2150, 0x04b5, 0x2150,
 		"Hantek", "DSO-2150",
 		buffersizes_32k,
-		FIRMWARE_DIR "/hantek-dso-2150.fw" },
+		"hantek-dso-2150.fw" },
 	{	0x04b4, 0x2250, 0x04b5, 0x2250,
 		"Hantek", "DSO-2250",
 		buffersizes_512k,
-		FIRMWARE_DIR "/hantek-dso-2250.fw" },
+		"hantek-dso-2250.fw" },
 	{	0x04b4, 0x5200, 0x04b5, 0x5200,
 		"Hantek", "DSO-5200",
 		buffersizes_14k,
-		FIRMWARE_DIR "/hantek-dso-5200.fw" },
+		"hantek-dso-5200.fw" },
 	{	0x04b4, 0x520a, 0x04b5, 0x520a,
 		"Hantek", "DSO-5200A",
 		buffersizes_512k,
-		FIRMWARE_DIR "/hantek-dso-5200A.fw" },
-	{ 0, 0, 0, 0, 0, 0, 0, 0 },
+		"hantek-dso-5200A.fw" },
+	ALL_ZERO
 };
 
 static const uint64_t timebases[][2] = {
@@ -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));
 
@@ -326,8 +323,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 				sdi->connection_id = g_strdup(connection_id);
 				devices = g_slist_append(devices, sdi);
 				devc = sdi->priv;
-				if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
-						prof->firmware) == SR_OK)
+				if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+						USB_CONFIGURATION, prof->firmware) == SR_OK)
 					/* Remember when the firmware on this device was updated */
 					devc->fw_updated = g_get_monotonic_time();
 				else
@@ -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);
 	}
@@ -431,7 +428,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	char str[128], *s;
+	char str[128];
+	const char *s;
 	const uint64_t *vdiv;
 	int ch_idx;
 
@@ -711,14 +709,14 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
 		int num_samples)
 {
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct dev_context *devc;
 	float ch1, ch2, range;
 	int num_channels, data_offset, i;
 
 	devc = sdi->priv;
 	num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
 	/* TODO: support for 5xxx series 9-bit samples */
 	analog.channels = devc->enabled_channels;
@@ -758,6 +756,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
 		}
 	}
 	sr_session_send(devc->cb_data, &packet);
+	g_free(analog.data);
 }
 
 /*
@@ -775,8 +774,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 
 	sdi = transfer->user_data;
 	devc = sdi->priv;
-	sr_spew("receive_transfer(): status %d received %d bytes.",
-		   transfer->status, transfer->actual_length);
+	sr_spew("receive_transfer(): status %s received %d bytes.",
+		libusb_error_name(transfer->status), transfer->actual_length);
 
 	if (transfer->actual_length == 0)
 		/* Nothing to send to the bus. */