X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=source%2Fdrv-protocol.h;h=f6906116893ee906b268dbdbe2c0123b25540e2d;hb=54207903a78f98c62a6fc7fb37e51c1f22187ba4;hp=ec14a717f6c34b538957323c3a7ba4225a285807;hpb=f3f6a56101d98c180b0e62027da1969b16decc6a;p=sigrok-util.git

diff --git a/source/drv-protocol.h b/source/drv-protocol.h
index ec14a71..f690611 100644
--- a/source/drv-protocol.h
+++ b/source/drv-protocol.h
@@ -21,31 +21,22 @@
 #define LIBSIGROK_HARDWARE_${upper}_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <glib.h>
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "${short}: "
-#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 "${short}"
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	/** The current sampling limit (in number of samples). */
-	uint64_t limit_samples;
+	/* Model-specific information */
 
-	/** The current sampling limit (in ms). */
-	uint64_t limit_msec;
+	/* Acquisition settings */
 
-	/** Opaque pointer passed in by the frontend. */
-	void *cb_data;
+	/* Operational state */
+
+	/* Temporary state across callbacks */
 
-	/** The current number of already received samples. */
-	uint64_t num_samples;
 };
 
 SR_PRIV int ${lib}_receive_data(int fd, int revents, void *cb_data);