newdriver: Drop obsolete checks and code chunks.

[sigrok-util.git] / source / drv-protocol.h

diff --git a/source/drv-protocol.h b/source/drv-protocol.h
index f2cd96f8ef9ff953db9fd95c977b36f27dbd58dc..30d42a53946d3913b516c4f8bfeeefb1900003a3 100644 (file)
--- 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,25 +17,18 @@
  * 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 LOG_PREFIX "${short}: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "{short}"
 
 /** Private, per-device-instance driver context. */
-struct dev_context {
+struct dev_context {{
        /* Model-specific information */
 
        /* Acquisition settings */
@@ -44,8 +37,8 @@ struct dev_context {
 
        /* 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