X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.h;h=38ef61bf1fe63c8354eff444ef1decee78ed19b2;hb=a5b35a167a32ffbaee1ce9c0de8501f781f733d1;hp=e21be0ee8a15ad02a12dfe9c8f508767df2cefb6;hpb=e749a8cb50029b6275a32a60c351d65f14fdf601;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index e21be0ee..38ef61bf 100644
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -26,9 +26,10 @@
 #define USB_CONFIGURATION      1
 #define DSO_EP_IN              0x86
 #define DSO_EP_OUT             0x02
+#define NUM_PROBES             2
 
 /* FX2 renumeration delay in ms */
-#define MAX_RENUM_DELAY        3000
+#define MAX_RENUM_DELAY_MS     3000
 
 #define MAX_CAPTURE_EMPTY      3
 
@@ -154,8 +155,6 @@ struct dso_profile {
 	uint16_t fw_pid;
 	char *vendor;
 	char *model;
-	char *model_version;
-	int num_probes;
 	char *firmware;
 };
 
@@ -170,7 +169,7 @@ struct context {
 	 * after the upgrade) this is like a global lock. No device will open
 	 * until a proper delay after the last device was upgraded.
 	 */
-	GTimeVal fw_updated;
+	int64_t fw_updated;
 	int epin_maxpacketsize;
 	int capture_empty_count;
 	int dev_state;
@@ -204,7 +203,7 @@ struct context {
 	unsigned char *framebuf;
 };
 
-SR_PRIV int dso_open(int dev_index);
+SR_PRIV int dso_open(struct sr_dev_inst *sdi);
 SR_PRIV void dso_close(struct sr_dev_inst *sdi);
 SR_PRIV int dso_enable_trigger(struct context *ctx);
 SR_PRIV int dso_force_trigger(struct context *ctx);