norma-dmm: Remove unused version field from state struct

[libsigrok.git] / src / hardware / norma-dmm / protocol.h

diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 80927150701b7d97f008ac00e035abae3993f73a..7ce7911f95986f6a45f0f2375e9a54bfe2f7c7c7 100644 (file)
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -25,7 +25,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @file
@@ -57,15 +57,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. */
@@ -74,8 +69,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 */
 };