scpi-pps: Support for the EEZ PSU series

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index c8784f54fec3d9b925ff97c7de897ac8fff4beef..471800315a1016a72768b73e7bf6a05cdd82fdf2 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -63,8 +63,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
  *
@@ -153,9 +153,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 +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
@@ -226,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);
@@ -586,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);
 
@@ -621,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