X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=source%2Fdrv-protocol.h;h=30d42a53946d3913b516c4f8bfeeefb1900003a3;hp=84b7ef516101799ea2aacc1f1bbe8da9c15efeff;hb=f6b99cb8bd9b84fb47d15cedc32f97832bdc13ba;hpb=5c100b148be923f92c383b9fb233dfb4ba3b790e

diff --git a/source/drv-protocol.h b/source/drv-protocol.h
index 84b7ef5..30d42a5 100644
--- a/source/drv-protocol.h
+++ b/source/drv-protocol.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) ${year} ${author} <${email}>
+ * Copyright (C) {year} {author} <{email}>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,38 +17,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSIGROK_HARDWARE_${upper}_PROTOCOL_H
-#define LIBSIGROK_HARDWARE_${upper}_PROTOCOL_H
+#ifndef LIBSIGROK_HARDWARE_{upper}_PROTOCOL_H
+#define LIBSIGROK_HARDWARE_{upper}_PROTOCOL_H
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.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;
+struct dev_context {{
+	/* 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 */
 
-	/** The current number of already received samples. */
-	uint64_t num_samples;
-};
+	/* Temporary state across callbacks */
 
-SR_PRIV int ${lib}_receive_data(int fd, int revents, void *cb_data);
+}};
+
+SR_PRIV int {lib}_receive_data(int fd, int revents, void *cb_data);
 
 #endif