#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
m = g_slist_append(NULL, g_strdup("libftdi"));
m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBFTDI_VERSION));
#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
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);
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);
WSACleanup();
#endif
+#ifdef HAVE_LIBHIDAPI
+ hid_exit();
+#endif
#ifdef HAVE_LIBUSB_1_0
libusb_exit(ctx->libusb_ctx);
#endif