X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=471800315a1016a72768b73e7bf6a05cdd82fdf2;hb=bb706a7690ac9b8d959631fc83b550f181ec3d9d;hp=379478a0704dd73b4ed366e767f57ba06146d21e;hpb=5d8b3913d4dc450b8af0ad028a379be775e278ef;p=libsigrok.git
diff --git a/src/backend.c b/src/backend.c
index 379478a0..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
*
@@ -122,69 +122,100 @@
* @{
*/
-static void print_versions(void)
+SR_API GSList *sr_buildinfo_libs_get(void)
{
- GString *s;
+ GSList *l = NULL, *m = NULL;
#if defined(HAVE_LIBUSB_1_0) && !defined(__FreeBSD__)
const struct libusb_version *lv;
#endif
- s = g_string_sized_new(200);
-
- sr_dbg("libsigrok %s/%s (rt: %s/%s).",
- SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,
- sr_package_version_string_get(), sr_lib_version_string_get());
-
- g_string_append(s, "Libs: ");
- g_string_append_printf(s, "glib %d.%d.%d (rt: %d.%d.%d/%d:%d), ",
+ m = g_slist_append(NULL, g_strdup("glib"));
+ m = g_slist_append(m, g_strdup_printf("%d.%d.%d (rt: %d.%d.%d/%d:%d)",
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
glib_major_version, glib_minor_version, glib_micro_version,
- glib_binary_age, glib_interface_age);
- g_string_append_printf(s, "libzip %s, ", CONF_LIBZIP_VERSION);
+ glib_binary_age, glib_interface_age));
+ l = g_slist_append(l, m);
+
+ m = g_slist_append(NULL, g_strdup("libzip"));
+ m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBZIP_VERSION));
+ l = g_slist_append(l, m);
+
#ifdef HAVE_LIBSERIALPORT
- g_string_append_printf(s, "libserialport %s/%s (rt: %s/%s), ",
+ m = g_slist_append(NULL, g_strdup("libserialport"));
+ m = g_slist_append(m, g_strdup_printf("%s/%s (rt: %s/%s)",
SP_PACKAGE_VERSION_STRING, SP_LIB_VERSION_STRING,
- sp_get_package_version_string(), sp_get_lib_version_string());
+ sp_get_package_version_string(), sp_get_lib_version_string()));
+ l = g_slist_append(l, m);
#endif
#ifdef HAVE_LIBUSB_1_0
+ m = g_slist_append(NULL, g_strdup("libusb-1.0"));
#ifdef __FreeBSD__
- g_string_append_printf(s, "libusb-1.0 %s, ", CONF_LIBUSB_1_0_VERSION);
+ m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBUSB_1_0_VERSION));
#else
lv = libusb_get_version();
- g_string_append_printf(s, "libusb-1.0 %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
- g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION);
+ m = g_slist_append(NULL, g_strdup("libftdi"));
+ m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBFTDI_VERSION));
+ l = g_slist_append(l, m);
#endif
#ifdef HAVE_LIBGPIB
- g_string_append_printf(s, "libgpib %s, ", CONF_LIBGPIB_VERSION);
+ m = g_slist_append(NULL, g_strdup("libgpib"));
+ m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBGPIB_VERSION));
+ l = g_slist_append(l, m);
#endif
#ifdef HAVE_LIBREVISA
- g_string_append_printf(s, "librevisa %s, ", CONF_LIBREVISA_VERSION);
+ m = g_slist_append(NULL, g_strdup("librevisa"));
+ m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBREVISA_VERSION));
+ l = g_slist_append(l, m);
#endif
- s->str[s->len - 2] = '.';
- s->str[s->len - 1] = '\0';
- sr_dbg("%s", s->str);
- s = g_string_truncate(s, 0);
- g_string_append_printf(s, "Host: %s, ", CONF_HOST);
+ return l;
+}
+
+SR_API char *sr_buildinfo_host_get(void)
+{
+ return g_strdup_printf("%s, %s-endian", CONF_HOST,
#ifdef WORDS_BIGENDIAN
- g_string_append_printf(s, "big-endian.");
+ "big"
#else
- g_string_append_printf(s, "little-endian.");
+ "little"
#endif
- sr_dbg("%s", s->str);
+ );
+}
- s = g_string_truncate(s, 0);
- g_string_append_printf(s, "SCPI backends: ");
+SR_API char *sr_buildinfo_scpi_backends_get(void)
+{
+ GString *s;
+ char *str;
+
+ s = g_string_sized_new(200);
g_string_append_printf(s, "TCP, ");
#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
@@ -196,11 +227,58 @@ static void print_versions(void)
#ifdef HAVE_LIBUSB_1_0
g_string_append_printf(s, "USBTMC, ");
#endif
+ s->str[s->len - 2] = '\0';
+
+ str = g_strdup(s->str);
+ g_string_free(s, TRUE);
+
+ return str;
+}
+
+static void print_versions(void)
+{
+ GString *s;
+ GSList *l, *l_orig, *m;
+ char *str;
+ const char *lib, *version;
+
+ sr_dbg("libsigrok %s/%s.",
+ sr_package_version_string_get(), sr_lib_version_string_get());
+
+ s = g_string_sized_new(200);
+ g_string_append(s, "Libs: ");
+ l_orig = sr_buildinfo_libs_get();
+ for (l = l_orig; l; l = l->next) {
+ m = l->data;
+ lib = m->data;
+ version = m->next->data;
+ g_string_append_printf(s, "%s %s, ", lib, version);
+ g_slist_free_full(m, g_free);
+ }
+ g_slist_free(l_orig);
s->str[s->len - 2] = '.';
s->str[s->len - 1] = '\0';
sr_dbg("%s", s->str);
-
g_string_free(s, TRUE);
+
+ str = sr_buildinfo_host_get();
+ sr_dbg("Host: %s.", str);
+ g_free(str);
+
+ str = sr_buildinfo_scpi_backends_get();
+ sr_dbg("SCPI backends: %s.", str);
+ 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);
}
/**
@@ -257,7 +335,10 @@ static int sanity_check_all_drivers(const struct sr_context *ctx)
sr_err("No dev_list in driver %d ('%s').", i, d);
errors++;
}
- /* Note: dev_clear() is optional. */
+ if (!drivers[i]->dev_clear) {
+ sr_err("No dev_clear in driver %d ('%s').", i, d);
+ errors++;
+ }
/* Note: config_get() is optional. */
if (!drivers[i]->config_set) {
sr_err("No config_set in driver %d ('%s').", i, d);
@@ -474,6 +555,8 @@ SR_API int sr_init(struct sr_context **ctx)
print_versions();
+ print_resourcepaths();
+
if (!ctx) {
sr_err("%s(): libsigrok context was NULL.", __func__);
return SR_ERR;
@@ -485,22 +568,22 @@ SR_API int sr_init(struct sr_context **ctx)
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
@@ -518,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);
@@ -525,9 +622,7 @@ SR_API int sr_init(struct sr_context **ctx)
context = NULL;
ret = SR_OK;
-#if defined(HAVE_LIBUSB_1_0) || defined(_WIN32)
done:
-#endif
g_free(context);
return ret;
}
@@ -555,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