X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fbackend.c;h=471800315a1016a72768b73e7bf6a05cdd82fdf2;hp=ef5cd260e280d426a20580cc64dbbfc46f4edaa6;hb=2622b4297fd4cc4bed5c06bb6ae0aaa8b40e0ece;hpb=17e0251d84235527612493d1f18bd55cf77a0112 diff --git a/src/backend.c b/src/backend.c index ef5cd260..47180031 100644 --- a/src/backend.c +++ b/src/backend.c @@ -63,8 +63,8 @@ * @section sec_irc IRC * * You can find the sigrok developers in the - * \#sigrok - * IRC channel on Freenode. + * \#sigrok + * IRC channel on Libera.Chat. * * @section sec_website Website * @@ -164,6 +164,16 @@ SR_API GSList *sr_buildinfo_libs_get(void) #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)); @@ -205,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 @@ -232,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); @@ -592,6 +601,20 @@ SR_API int sr_init(struct sr_context **ctx) ret = SR_ERR; goto done; } +#endif +#ifdef HAVE_LIBHIDAPI + /* + * According to , 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); @@ -627,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