demo: Do not use a separate thread for generating data

[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..2dc6af57ed6d81da171193a68ff510494a1900a5 100644 (file)
--- a/hardware/fluke-dmm/fluke-dmm.h
+++ b/hardware/fluke-dmm/fluke-dmm.h
@@ -21,6 +21,15 @@
 #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 */
@@ -37,18 +46,12 @@ struct flukedmm_profile {
        int poll_period;
 };
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 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;