X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=ef5cd260e280d426a20580cc64dbbfc46f4edaa6;hb=755793e991c4d429f99254f23008bfddb89d8e00;hp=e5fe6a3f764edcce2cb678e92f93a22277b6d486;hpb=f778bf02eaf0d7fa7ccb91a0da8a68233f1fb79a;p=libsigrok.git

diff --git a/src/backend.c b/src/backend.c
index e5fe6a3f..ef5cd260 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -153,8 +153,14 @@ SR_API GSList *sr_buildinfo_libs_get(void)
 	m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBUSB_1_0_VERSION));
 #else
 	lv = libusb_get_version();
-	m = g_slist_append(m, g_strdup_printf("%d.%d.%d.%d%s",
-		lv->major, lv->minor, lv->micro, lv->nano, lv->rc));
+	m = g_slist_append(m, g_strdup_printf("%d.%d.%d.%d%s API 0x%08x",
+		lv->major, lv->minor, lv->micro, lv->nano, lv->rc,
+#if defined(LIBUSB_API_VERSION)
+		LIBUSB_API_VERSION
+#elif defined(LIBUSBX_API_VERSION)
+		LIBUSBX_API_VERSION
+#endif
+		));
 #endif
 	l = g_slist_append(l, m);
 #endif
@@ -255,6 +261,17 @@ static void print_versions(void)
 	g_free(str);
 }
 
+static void print_resourcepaths(void)
+{
+	GSList *l, *l_orig;
+
+	sr_dbg("Firmware search paths:");
+	l_orig = sr_resourcepaths_get(SR_RESOURCE_FIRMWARE);
+	for (l = l_orig; l; l = l->next)
+		sr_dbg(" - %s", (const char *)l->data);
+	g_slist_free_full(l_orig, g_free);
+}
+
 /**
  * Sanity-check all libsigrok drivers.
  *
@@ -529,6 +546,8 @@ SR_API int sr_init(struct sr_context **ctx)
 
 	print_versions();
 
+	print_resourcepaths();
+
 	if (!ctx) {
 		sr_err("%s(): libsigrok context was NULL.", __func__);
 		return SR_ERR;
@@ -540,22 +559,22 @@ SR_API int sr_init(struct sr_context **ctx)
 
 	if (sanity_check_all_drivers(context) < 0) {
 		sr_err("Internal driver error(s), aborting.");
-		return ret;
+		goto done;
 	}
 
 	if (sanity_check_all_input_modules() < 0) {
 		sr_err("Internal input module error(s), aborting.");
-		return ret;
+		goto done;
 	}
 
 	if (sanity_check_all_output_modules() < 0) {
 		sr_err("Internal output module error(s), aborting.");
-		return ret;
+		goto done;
 	}
 
 	if (sanity_check_all_transform_modules() < 0) {
 		sr_err("Internal transform module error(s), aborting.");
-		return ret;
+		goto done;
 	}
 
 #ifdef _WIN32
@@ -580,9 +599,7 @@ SR_API int sr_init(struct sr_context **ctx)
 	context = NULL;
 	ret = SR_OK;
 
-#if defined(HAVE_LIBUSB_1_0) || defined(_WIN32)
 done:
-#endif
 	g_free(context);
 	return ret;
 }