build: Portability fixes.

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

diff --git a/hardware/norma-dmm/protocol.h b/hardware/norma-dmm/protocol.h
index e9a956e31115c19eadc55c946e95ab6f78a1e027..951734e8f99667b7502375e4e0eab500309e9d5d 100644 (file)
--- a/hardware/norma-dmm/protocol.h
+++ b/hardware/norma-dmm/protocol.h
@@ -29,17 +29,17 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "norma-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+/** @file
+ *  Norma DM9x0/Siemens B102x DMMs driver.
+ *  @internal
+ */
+
+#define LOG_PREFIX "norma-dmm"
 
 #define NMADMM_BUFSIZE  256
 
+#define NMADMM_TIMEOUT_MS 2000 /**< Request timeout. */
+
 /** Norma DMM request types (used ones only, the DMMs support about 50). */
 enum {
        NMADMM_REQ_IDN = 0,     /**< Request identity */
@@ -70,6 +70,7 @@ struct dev_context {
 
        /* 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. */