X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fprotocol.h;h=bec6107046b51e0a11f5f66a6e7aca1b973c1f78;hb=f6e7b6124a646b0ece644681d4e0172ffb30a561;hp=951734e8f99667b7502375e4e0eab500309e9d5d;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 951734e8..bec61070 100644
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -23,20 +23,22 @@
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-/** @file
- *  Norma DM9x0/Siemens B102x DMMs driver.
- *  @internal
+/**
+ * @file
+ *
+ * Norma DM9x0/Siemens B102x DMMs driver.
+ *
+ * @internal
  */
 
 #define LOG_PREFIX "norma-dmm"
 
-#define NMADMM_BUFSIZE  256
+#define NMADMM_BUFSIZE 256
 
 #define NMADMM_TIMEOUT_MS 2000 /**< Request timeout. */
 
@@ -58,15 +60,10 @@ extern const struct nmadmm_req nmadmm_requests[];
 /** Private, per-device-instance driver context. */
 struct dev_context {
 	/* Model-specific information */
-	char *version;		/**< Version string */
 	int type;		/**< DM9x0, e.g. 5 = DM950 */
 
 	/* Acquisition settings */
-	uint64_t limit_samples;	/**< Target number of samples */
-	uint64_t limit_msec;	/**< Target sampling time */
-
-	/* Opaque pointer passed in by frontend. */
-	void *cb_data;
+	struct sr_sw_limits limits;
 
 	/* Operational state */
 	int last_req;			/**< Last request. */
@@ -75,8 +72,6 @@ struct dev_context {
 	int lowbatt;			/**< Low battery. 1=low, 2=critical. */
 
 	/* Temporary state across callbacks */
-	uint64_t num_samples;		/**< Current #samples. */
-	GTimer *elapsed_msec;		/**< Used for limit_msec */
 	uint8_t buf[NMADMM_BUFSIZE];	/**< Buffer for read callback */
 	int buflen;			/**< Data len in buf */
 };