X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session_file.c;h=6c794545de28b74ef8f4699a15b62675988e778b;hb=bc059b42a26bbfa1d64bbf617abe4d440bdc57c5;hp=d720dd599eae866299b987fc5a1c2873b2ceb72f;hpb=5f9c4c8a34e6c1d122d36efd2e8263f0456541bd;p=libsigrok.git diff --git a/session_file.c b/session_file.c index d720dd59..6c794545 100644 --- a/session_file.c +++ b/session_file.c @@ -30,14 +30,7 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with subsystem-specific prefix string. */ -#define LOG_PREFIX "session-file: " -#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 "session-file" /** * @file @@ -188,7 +181,7 @@ SR_API int sr_session_load(const char *filename) g_variant_new_uint64(tmp_u64), sdi, NULL); } else if (!strcmp(keys[j], "total probes")) { total_probes = strtoull(val, NULL, 10); - sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES, + sdi->driver->config_set(SR_CONF_NUM_LOGIC_PROBES, g_variant_new_uint64(total_probes), sdi, NULL); for (p = 0; p < total_probes; p++) { snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);