X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=8a7e9f744a434167b189eca699470e0aade44690;hb=45c59c8bdd01954f9214fe7b869d92c55415d109;hp=5701f4d554fea6299ade25c246c1fbe6b3f0b7a6;hpb=e749a8cb50029b6275a32a60c351d65f14fdf601;p=libsigrok.git

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 5701f4d5..8a7e9f74 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -29,15 +29,14 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "config.h"
 #include "dso.h"
 
-/* FIXME: Temporary build fix, this will be removed later. */
-#define GTV_TO_MSEC(gtv)       (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
 
-/* Max time in ms before we want to check on events */
+/* Max time in ms before we want to check on USB events */
+/* TODO tune this properly */
 #define TICK    1
 
 static const int hwcaps[] = {
@@ -62,12 +61,22 @@ static const char *probe_names[] = {
 };
 
 static const struct dso_profile dev_profiles[] = {
-	{	0x04b4, 0x2090,
-		0x04b5, 0x2090,
+	{	0x04b4, 0x2090, 0x04b5, 0x2090,
 		"Hantek", "DSO-2090",
-		NULL, 2,
-		FIRMWARE_DIR "/hantek-dso-2090.fw" },
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+		FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+	{	0x04b4, 0x2150, 0x04b5, 0x2150,
+		"Hantek", "DSO-2150",
+		FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+	{	0x04b4, 0x2250, 0x04b5, 0x2250,
+		"Hantek", "DSO-2250",
+		FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+	{	0x04b4, 0x5200, 0x04b5, 0x5200,
+		"Hantek", "DSO-5200",
+		FIRMWARE_DIR "/hantek-dso-5xxx.fw" },
+	{	0x04b4, 0x520a, 0x04b5, 0x520a,
+		"Hantek", "DSO-5200A",
+		FIRMWARE_DIR "/hantek-dso-5xxx.fw" },
+	{ 0, 0, 0, 0, 0, 0, 0 },
 };
 
 static const uint64_t buffersizes[] = {
@@ -117,6 +126,7 @@ static const char *trigger_sources[] = {
 	"CH1",
 	"CH2",
 	"EXT",
+	/* TODO: forced */
 	NULL,
 };
 
@@ -143,7 +153,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
 	struct context *ctx;
 
 	sdi = sr_dev_inst_new(index, SR_ST_INITIALIZING,
-		prof->vendor, prof->model, prof->model_version);
+		prof->vendor, prof->model, NULL);
 	if (!sdi)
 		return NULL;
 
@@ -228,7 +238,7 @@ static int hw_init(const char *devinfo)
 				if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
 						prof->firmware) == SR_OK)
 					/* Remember when the firmware on this device was updated */
-					g_get_current_time(&ctx->fw_updated);
+					ctx->fw_updated = g_get_monotonic_time();
 				else
 					sr_err("hantek-dso: firmware upload failed for "
 					       "device %d", devcnt);
@@ -263,33 +273,34 @@ static int hw_init(const char *devinfo)
 
 static int hw_dev_open(int dev_index)
 {
-	GTimeVal cur_time;
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
-	int timediff, err;
+	int64_t timediff_us, timediff_ms;
+	int err;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ERR_ARG;
 	ctx = sdi->priv;
 
 	/*
-	 * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
+	 * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
 	 * for the FX2 to renumerate
 	 */
-	err = 0;
-	if (GTV_TO_MSEC(ctx->fw_updated) > 0) {
+	err = SR_ERR;
+	if (ctx->fw_updated > 0) {
 		sr_info("hantek-dso: waiting for device to reset");
 		/* takes at least 300ms for the FX2 to be gone from the USB bus */
 		g_usleep(300 * 1000);
-		timediff = 0;
-		while (timediff < MAX_RENUM_DELAY) {
+		timediff_ms = 0;
+		while (timediff_ms < MAX_RENUM_DELAY_MS) {
 			if ((err = dso_open(dev_index)) == SR_OK)
 				break;
 			g_usleep(100 * 1000);
-			g_get_current_time(&cur_time);
-			timediff = GTV_TO_MSEC(cur_time) - GTV_TO_MSEC(ctx->fw_updated);
+			timediff_us = g_get_monotonic_time() - ctx->fw_updated;
+			timediff_ms = timediff_us / 1000;
+			sr_spew("hantek-dso: waited %" PRIi64 " ms", timediff_ms);
 		}
-		sr_info("hantek-dso: device came back after %d ms", timediff);
+		sr_info("hantek-dso: device came back after %d ms", timediff_ms);
 	} else {
 		err = dso_open(dev_index);
 	}
@@ -358,13 +369,11 @@ static int hw_cleanup(void)
 static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
 	struct sr_dev_inst *sdi;
-	struct context *ctx;
 	const void *info;
 	uint64_t tmp;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return NULL;
-	ctx = sdi->priv;
 
 	info = NULL;
 	switch (dev_info_id) {
@@ -372,7 +381,7 @@ static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 		info = sdi;
 		break;
 	case SR_DI_NUM_PROBES:
-		info = GINT_TO_POINTER(ctx->profile->num_probes);
+		info = GINT_TO_POINTER(NUM_PROBES);
 		break;
 	case SR_DI_PROBE_NAMES:
 		info = probe_names;
@@ -814,7 +823,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	/* Send metadata about the SR_DF_ANALOG packets to come. */
 	packet.type = SR_DF_META_ANALOG;
 	packet.payload = &meta;
-	meta.num_probes = ctx->profile->num_probes;
+	meta.num_probes = NUM_PROBES;
 	sr_session_send(cb_data, &packet);
 
 	return SR_OK;