output/csv: use intermediate time_t var, silence compiler warning

[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 082e736a617e0e71911e95dbd338ede9ef76041b..9891741ee88e0101b34be1bf51deb37c316f7ec2 100644 (file)
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -28,14 +28,9 @@
 #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,25 +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 */
+       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 */
 };