X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session_driver.c;h=2b6bfbbeda9a9c0ce9e297c1da5cec802163f851;hb=9f54e0e84f93ca4773994d4ee3c2cf3d8989790b;hp=4c7082cac00b3de4257a7014b5008e1c84b091fa;hpb=016f2e005ddbc604594c863dca8a89212bf46a5c;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index 4c7082ca..2b6bfbbe 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "virtual-session: "
-#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 "virtual-session"
 
 /* size of payloads sent across the session bus */
 /** @cond PRIVATE */
@@ -251,7 +244,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	case SR_CONF_CAPTURE_UNITSIZE:
 		vdev->unitsize = g_variant_get_uint64(data);
 		break;
-	case SR_CONF_CAPTURE_NUM_PROBES:
+	case SR_CONF_NUM_LOGIC_PROBES:
 		vdev->num_probes = g_variant_get_uint64(data);
 		break;
 	default:
@@ -291,7 +284,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	if (!(vdev->archive = zip_open(vdev->sessionfile, 0, &ret))) {
 		sr_err("Failed to open session file '%s': "
-		       "zip error %d\n", vdev->sessionfile, ret);
+		       "zip error %d.", vdev->sessionfile, ret);
 		return SR_ERR;
 	}