X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=1fbba5c1a5aff810839fc50606896e8b5b157783;hb=4b3197828d53587db7111e275390cc4857c2fdae;hp=a88459ac50f7eaaf123210ddb2fe8303b65ad394;hpb=928560e6f52f1287155ae8deb9e97e5607ec98db;p=libsigrok.git

diff --git a/src/backend.c b/src/backend.c
index a88459ac..1fbba5c1 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
@@ -226,8 +232,7 @@ static void print_versions(void)
 	char *str;
 	const char *lib, *version;
 
-	sr_dbg("libsigrok %s/%s (rt: %s/%s).",
-		SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,
+	sr_dbg("libsigrok %s/%s.",
 		sr_package_version_string_get(), sr_lib_version_string_get());
 
 	s = g_string_sized_new(200);
@@ -255,6 +260,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 +545,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;