X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fprotocol.h;h=db19498a12a19925f063b233a1015b0fdf5b2038;hb=35159a6b28adfbed14d10b745668bee47b5b8c1a;hp=cd8380e3d1d7d399a50be0b87fcd42aca8bf2280;hpb=96484e22b46af66216d1e0357c6e3478494d416c;p=libsigrok.git

diff --git a/hardware/saleae-logic16/protocol.h b/hardware/saleae-logic16/protocol.h
index cd8380e3..db19498a 100644
--- a/hardware/saleae-logic16/protocol.h
+++ b/hardware/saleae-logic16/protocol.h
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "saleae-logic16: "
-#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 "saleae-logic16"
 
 enum voltage_range {
 	VOLTAGE_RANGE_UNKNOWN,
@@ -82,7 +75,7 @@ struct dev_context {
 	void *cb_data;
 	unsigned int num_transfers;
 	struct libusb_transfer **transfers;
-	int *usbfd;
+	struct sr_context *ctx;
 };
 
 SR_PRIV int logic16_setup_acquisition(const struct sr_dev_inst *sdi,