X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fprotocol.h;h=9891741ee88e0101b34be1bf51deb37c316f7ec2;hb=f1a37f39244d97bcd3abb1c29d6a71e9b9edfefe;hp=80927150701b7d97f008ac00e035abae3993f73a;hpb=8d5228015d0f07ce6626aa52ffb80bc4129f7dbe;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 80927150..9891741e 100644
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -25,17 +25,12 @@
 #include <ctype.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
- */
-
 #define LOG_PREFIX "norma-dmm"
 
-#define NMADMM_BUFSIZE  256
+#define NMADMM_BUFSIZE 256
 
 #define NMADMM_TIMEOUT_MS 2000 /**< Request timeout. */
 
@@ -54,28 +49,16 @@ struct nmadmm_req {
 /** Strings for requests. */
 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. */
 	int64_t req_sent_at;		/**< Request sent. */
 	gboolean last_req_pending;	/**< Last request not answered yet. */
 	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 */
 };