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

diff --git a/src/backend.c b/src/backend.c
index e5fe6a3f..82ad42f7 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -25,6 +25,7 @@
 #endif
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "minilzo/minilzo.h"
 
 /** @cond PRIVATE */
 #define LOG_PREFIX "backend"
@@ -63,8 +64,8 @@
  * @section sec_irc IRC
  *
  * You can find the sigrok developers in the
- * <a href="irc://chat.freenode.net/sigrok">\#sigrok</a>
- * IRC channel on Freenode.
+ * <a href="ircs://irc.libera.chat/#sigrok">\#sigrok</a>
+ * IRC channel on Libera.Chat.
  *
  * @section sec_website Website
  *
@@ -136,10 +137,18 @@ SR_API GSList *sr_buildinfo_libs_get(void)
 		glib_binary_age, glib_interface_age));
 	l = g_slist_append(l, m);
 
+	m = g_slist_append(NULL, g_strdup("zlib"));
+	m = g_slist_append(m, g_strdup_printf("%s", CONF_ZLIB_VERSION));
+	l = g_slist_append(l, m);
+
 	m = g_slist_append(NULL, g_strdup("libzip"));
 	m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBZIP_VERSION));
 	l = g_slist_append(l, m);
 
+	m = g_slist_append(NULL, g_strdup("minilzo"));
+	m = g_slist_append(m, g_strdup_printf("%s", lzo_version_string()));
+	l = g_slist_append(l, m);
+
 #ifdef HAVE_LIBSERIALPORT
 	m = g_slist_append(NULL, g_strdup("libserialport"));
 	m = g_slist_append(m, g_strdup_printf("%s/%s (rt: %s/%s)",
@@ -153,9 +162,25 @@ 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
+#ifdef HAVE_LIBHIDAPI
+	m = g_slist_append(NULL, g_strdup("hidapi"));
+	m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBHIDAPI_VERSION));
+	l = g_slist_append(l, m);
+#endif
+#ifdef HAVE_LIBBLUEZ
+	m = g_slist_append(NULL, g_strdup("bluez"));
+	m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBBLUEZ_VERSION));
 	l = g_slist_append(l, m);
 #endif
 #ifdef HAVE_LIBFTDI
@@ -199,7 +224,7 @@ SR_API char *sr_buildinfo_scpi_backends_get(void)
 #if HAVE_RPC
 	g_string_append_printf(s, "RPC, ");
 #endif
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 	g_string_append_printf(s, "serial, ");
 #endif
 #ifdef HAVE_LIBREVISA
@@ -226,8 +251,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 +279,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 +564,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 +577,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
@@ -566,6 +603,14 @@ SR_API int sr_init(struct sr_context **ctx)
 	}
 #endif
 
+	if ((ret = lzo_init()) != LZO_E_OK) {
+		sr_err("lzo_init() failed with return code %d.", ret);
+		sr_err("This usually indicates a compiler bug. Recompile without");
+		sr_err("optimizations, and enable '-DLZO_DEBUG' for diagnostics.");
+		ret = SR_ERR;
+		goto done;
+	}
+
 #ifdef HAVE_LIBUSB_1_0
 	ret = libusb_init(&context->libusb_ctx);
 	if (LIBUSB_SUCCESS != ret) {
@@ -573,6 +618,20 @@ SR_API int sr_init(struct sr_context **ctx)
 		ret = SR_ERR;
 		goto done;
 	}
+#endif
+#ifdef HAVE_LIBHIDAPI
+	/*
+	 * According to <hidapi.h>, the hid_init() routine just returns
+	 * zero or non-zero, and hid_error() appears to relate to calls
+	 * for a specific device after hid_open(). Which means that there
+	 * is no more detailled information available beyond success/fail
+	 * at this point in time.
+	 */
+	if (hid_init() != 0) {
+		sr_err("HIDAPI hid_init() failed.");
+		ret = SR_ERR;
+		goto done;
+	}
 #endif
 	sr_resource_set_hooks(context, NULL, NULL, NULL, NULL);
 
@@ -580,9 +639,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;
 }
@@ -610,6 +667,9 @@ SR_API int sr_exit(struct sr_context *ctx)
 	WSACleanup();
 #endif
 
+#ifdef HAVE_LIBHIDAPI
+	hid_exit();
+#endif
 #ifdef HAVE_LIBUSB_1_0
 	libusb_exit(ctx->libusb_ctx);
 #endif