X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Ffluke-dmm.h;h=4291be06c5183e69a8440f31cf4d3d6da8df4699;hb=4374219bc8c26997bb5c13c57f0babe3a61cd47e;hp=9994af5c6e9848492e4a295e2c73894f33927d60;hpb=31d84da3a22cc6fc9b2226ab3863e9235a3d5b87;p=libsigrok.git

diff --git a/hardware/fluke-dmm/fluke-dmm.h b/hardware/fluke-dmm/fluke-dmm.h
index 9994af5c..4291be06 100644
--- 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>
  *
@@ -17,18 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef LIBSIGROK_HARDWARE_FLUKE_DMM_FLUKE_DMM_H
+#define LIBSIGROK_HARDWARE_FLUKE_DMM_FLUKE_DMM_H
 
-#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 LOG_PREFIX "fluke-dmm"
 
 #define FLUKEDMM_BUFSIZE  256
 
@@ -36,6 +28,7 @@
 enum {
 	FLUKE_187 = 1,
 	FLUKE_287,
+	FLUKE_190,
 };
 
 /* Supported device profiles */
@@ -44,6 +37,8 @@ struct flukedmm_profile {
 	const char *modelname;
 	/* How often to poll, in ms. */
 	int poll_period;
+	/* If no response received, how long to wait before retrying. */
+	int timeout;
 };
 
 /* Private, per-device-instance driver context. */
@@ -51,8 +46,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;
@@ -63,8 +56,13 @@ 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);
 
-#endif /* LIBSIGROK_FLUKE_DMM_H */
+#endif