X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Ffluke-dmm.h;h=ec48678d6e33e66ae694e82c741c15ed838d7a5b;hb=2c9c0df86eaf9b64cf0ba7537b3c3c84f2da4686;hp=7174531c4ee8df49fa030076a083704ff537bd16;hpb=acd29accb3a458ab6a494e3f6c42dacc56a4c7a8;p=libsigrok.git

diff --git a/hardware/fluke-dmm/fluke-dmm.h b/hardware/fluke-dmm/fluke-dmm.h
index 7174531c..ec48678d 100644
--- a/hardware/fluke-dmm/fluke-dmm.h
+++ b/hardware/fluke-dmm/fluke-dmm.h
@@ -21,23 +21,32 @@
 #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 */
 struct flukedmm_profile {
 	int model;
 	const char *modelname;
-};
-
-/* Private driver context. */
-struct drv_context {
-	GSList *instances;
+	/* 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. */
@@ -46,15 +55,23 @@ struct dev_context {
 	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;
 
 	/* Runtime. */
 	uint64_t num_samples;
-	unsigned char buf[FLUKEDMM_BUFSIZE];
+	char buf[FLUKEDMM_BUFSIZE];
 	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 */