X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.h;h=1a8ad43b48d6481fe6a9bbcc58c8bf1b71ce1ce2;hb=6fab7b8f5365c7be69be4a755910945b6113dd8f;hp=c65a8eb0469558e3bc269f10bbd15ee1dd87e27a;hpb=ea9cfed7a55260ab97f57150b57c42a28c3a85a7;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index c65a8eb0..1a8ad43b 100644
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -22,6 +22,15 @@
 #ifndef LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 #define LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "asix-sigma: "
+#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)
+
 enum sigma_write_register {
 	WRITE_CLOCK_SELECT	= 0,
 	WRITE_TRIGGER_SELECT0	= 1,
@@ -174,7 +183,7 @@ struct sigma_state {
 };
 
 /* Private, per-device-instance driver context. */
-struct context {
+struct dev_context {
 	struct ftdi_context ftdic;
 	uint64_t cur_samplerate;
 	uint64_t period_ps;
@@ -187,7 +196,7 @@ struct context {
 	struct sigma_trigger trigger;
 	int use_triggers;
 	struct sigma_state state;
-	gpointer session_id;
+	void *session_dev_id;
 };
 
 #endif