X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=ce2ca6554a70776b81a5d45d88fa4c864014896e;hb=d03dfac6b9c07812c0b7b21858b247088d5605aa;hp=e5411a45af69ff73efca16448b396bac52552001;hpb=2eb84c983584490153fe2bcbf10cc7ceaf46d033;p=libsigrok.git

diff --git a/device.c b/device.c
index e5411a45..ce2ca655 100644
--- a/device.c
+++ b/device.c
@@ -23,14 +23,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "device: "
-#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 "device"
 
 /**
  * @file
@@ -217,7 +210,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 		return FALSE;
 
 	if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS,
-				&gvar, NULL, NULL) != SR_OK)
+				&gvar, sdi, NULL) != SR_OK)
 		return FALSE;
 
 	ret = FALSE;
@@ -387,6 +380,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 }
 #endif
 
+/** @private */
 SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
 {
 	struct sr_usbtmc_dev_inst *usbtmc;
@@ -407,6 +401,7 @@ SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
 	return usbtmc;
 }
 
+/** @private */
 SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
 {
 	g_free(usbtmc->device);