GPL headers: Use correct project name.

[libsigrok.git] / hardware / fluke-dmm / fluke-dmm.h

diff --git a/hardware/fluke-dmm/fluke-dmm.h b/hardware/fluke-dmm/fluke-dmm.h
index 0aac45b7c23b4cedb11f91a37d5153ed3456832a..152e09c4dcc9135e358c4bed056cbd17c0fbd271 100644 (file)
--- a/hardware/fluke-dmm/fluke-dmm.h
+++ b/hardware/fluke-dmm/fluke-dmm.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -21,12 +21,22 @@
 #ifndef LIBSIGROK_FLUKE_DMM_H
 #define LIBSIGROK_FLUKE_DMM_H
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "fluke-dmm: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
 #define FLUKEDMM_BUFSIZE  256
 
 /* Supported models */
 enum {
        FLUKE_187 = 1,
        FLUKE_287,
+       FLUKE_190,
 };
 
 /* Supported device profiles */
@@ -35,11 +45,8 @@ struct flukedmm_profile {
        const char *modelname;
        /* How often to poll, in ms. */
        int poll_period;
-};
-
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
+       /* If no response received, how long to wait before retrying. */
+       int timeout;
 };
 
 /* Private, per-device-instance driver context. */
@@ -47,8 +54,6 @@ struct dev_context {
        const struct flukedmm_profile *profile;
        uint64_t limit_samples;
        uint64_t limit_msec;
-       struct sr_serial_dev_inst *serial;
-       char *serialcomm;
 
        /* Opaque pointer passed in by the frontend. */
        void *cb_data;
@@ -59,6 +64,11 @@ struct dev_context {
        int buflen;
        int64_t cmd_sent_at;
        int expect_response;
+       int meas_type;
+       int is_relative;
+       int mq;
+       int unit;
+       int mqflags;
 };
 
 SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data);