X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fbackend.c;h=9be64cd139be67af909846f86844ec0be9f0cf10;hp=0a9bf1361baf5b5e3d2e74acd977a26939678777;hb=33306b13acdc34fb50b35a56d362f1ab56fc0afd;hpb=e6104296c29f31e812c964da53093bdc6292efcd

diff --git a/src/backend.c b/src/backend.c
index 0a9bf136..9be64cd1 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -155,8 +155,23 @@ SR_API GSList *sr_buildinfo_libs_get(void)
 	lv = libusb_get_version();
 	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,
-		LIBUSB_API_VERSION));
+#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
@@ -200,7 +215,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
@@ -227,8 +242,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);
@@ -587,6 +601,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);
 
@@ -622,6 +650,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