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
#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);
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.
*
print_versions();
+ print_resourcepaths();
+
if (!ctx) {
sr_err("%s(): libsigrok context was NULL.", __func__);
return SR_ERR;
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
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);
context = NULL;
ret = SR_OK;
-#if defined(HAVE_LIBUSB_1_0) || defined(_WIN32)
done:
-#endif
g_free(context);
return ret;
}
WSACleanup();
#endif
+#ifdef HAVE_LIBHIDAPI
+ hid_exit();
+#endif
#ifdef HAVE_LIBUSB_1_0
libusb_exit(ctx->libusb_ctx);
#endif