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 a8af261384b78603c568aee89a5c46514e5d2168..951734e8f99667b7502375e4e0eab500309e9d5d 100644 (file)
--- a/hardware/norma-dmm/protocol.h
+++ b/hardware/norma-dmm/protocol.h
@@ -21,31 +21,67 @@
 #define LIBSIGROK_HARDWARE_NORMA_DMM_PROTOCOL_H
 
 #include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <math.h>
 #include <glib.h>
 #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 */
+       NMADMM_REQ_STATUS,      /**< Request device status (value + ...) */
+};
+
+/** Defines requests used to communicate with device. */
+struct nmadmm_req {
+       int req_type;           /**< Request type. */
+       const char *req_str;    /**< Request string. */
+};
+
+/** 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;
 
        /* 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 */
 };
 
 SR_PRIV int norma_dmm_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int xgittoint(char xgit);
 
 #endif