X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbackend.c;h=5be826abaa8352d8314f4ef1128e601dde270838;hb=5dd538ded0d5873541af7cdf2e54c3e6d8297b49;hp=ae56f37020d93987da63f37713f01411ef354486;hpb=b1f8310376265f622c6f7d81c0cc0580598ea973;p=libsigrok.git
diff --git a/src/backend.c b/src/backend.c
index ae56f370..5be826ab 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -18,9 +18,9 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -79,10 +79,10 @@
*
* Initializing and shutting down libsigrok.
*
- * Before using any of the libsigrok functionality (except
- * sr_log_loglevel_set() and sr_log_opts_set()), sr_init() must
- * be called to initialize the library, which will return a struct sr_context
- * when the initialization was successful.
+ * Before using any of the libsigrok functionality (except for
+ * sr_log_loglevel_set()), sr_init() must be called to initialize the
+ * library, which will return a struct sr_context when the initialization
+ * was successful.
*
* When libsigrok functionality is no longer needed, sr_exit() should be
* called, which will (among other things) free the struct sr_context.
@@ -119,21 +119,108 @@
* @{
*/
+static void print_versions(void)
+{
+ GString *s;
+#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), ",
+ 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);
+#ifdef HAVE_LIBSERIALPORT
+ g_string_append_printf(s, "libserialport %s/%s (rt: %s/%s), ",
+ SP_PACKAGE_VERSION_STRING, SP_LIB_VERSION_STRING,
+ sp_get_package_version_string(), sp_get_lib_version_string());
+#endif
+#ifdef HAVE_LIBUSB_1_0
+#ifdef __FreeBSD__
+ g_string_append_printf(s, "libusb-1.0 %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);
+#endif
+#endif
+#ifdef HAVE_LIBFTDI
+ g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION);
+#endif
+#ifdef HAVE_LIBGPIB
+ g_string_append_printf(s, "libgpib %s, ", CONF_LIBGPIB_VERSION);
+#endif
+#ifdef HAVE_LIBREVISA
+ g_string_append_printf(s, "librevisa %s, ", CONF_LIBREVISA_VERSION);
+#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);
+#ifdef WORDS_BIGENDIAN
+ g_string_append_printf(s, "big-endian.");
+#else
+ g_string_append_printf(s, "little-endian.");
+#endif
+ sr_dbg("%s", s->str);
+
+ s = g_string_truncate(s, 0);
+ g_string_append_printf(s, "SCPI backends: ");
+
+ g_string_append_printf(s, "TCP, ");
+#if HAVE_RPC
+ g_string_append_printf(s, "RPC, ");
+#endif
+#ifdef HAVE_LIBSERIALPORT
+ g_string_append_printf(s, "serial, ");
+#endif
+#ifdef HAVE_LIBREVISA
+ g_string_append_printf(s, "VISA, ");
+#endif
+#ifdef HAVE_LIBGPIB
+ g_string_append_printf(s, "GPIB, ");
+#endif
+#ifdef HAVE_LIBUSB_1_0
+ g_string_append_printf(s, "USBTMC, ");
+#endif
+ s->str[s->len - 2] = '.';
+ s->str[s->len - 1] = '\0';
+ sr_dbg("%s", s->str);
+
+ g_string_free(s, TRUE);
+}
+
/**
* Sanity-check all libsigrok drivers.
*
+ * @param[in] ctx Pointer to a libsigrok context struct. Must not be NULL.
+ *
* @retval SR_OK All drivers are OK
* @retval SR_ERR One or more drivers have issues.
+ * @retval SR_ERR_ARG Invalid argument.
*/
-static int sanity_check_all_drivers(void)
+static int sanity_check_all_drivers(const struct sr_context *ctx)
{
int i, errors, ret = SR_OK;
struct sr_dev_driver **drivers;
const char *d;
+ if (!ctx)
+ return SR_ERR_ARG;
+
sr_spew("Sanity-checking all drivers.");
- drivers = sr_driver_list();
+ drivers = sr_driver_list(ctx);
for (i = 0; drivers[i]; i++) {
errors = 0;
@@ -375,13 +462,27 @@ SR_API int sr_init(struct sr_context **ctx)
{
int ret = SR_ERR;
struct sr_context *context;
+ struct sr_dev_driver ***lists, **drivers;
+ GArray *array;
+
+ print_versions();
if (!ctx) {
sr_err("%s(): libsigrok context was NULL.", __func__);
return SR_ERR;
}
- if (sanity_check_all_drivers() < 0) {
+ context = g_malloc0(sizeof(struct sr_context));
+
+ /* Generate ctx->driver_list at runtime. */
+ array = g_array_new(TRUE, FALSE, sizeof(struct sr_dev_driver *));
+ for (lists = drivers_lists; *lists; lists++)
+ for (drivers = *lists; *drivers; drivers++)
+ g_array_append_val(array, *drivers);
+ context->driver_list = (struct sr_dev_driver **)array->data;
+ g_array_free(array, FALSE);
+
+ if (sanity_check_all_drivers(context) < 0) {
sr_err("Internal driver error(s), aborting.");
return ret;
}
@@ -401,9 +502,6 @@ SR_API int sr_init(struct sr_context **ctx)
return ret;
}
- /* + 1 to handle when struct sr_context has no members. */
- context = g_malloc0(sizeof(struct sr_context) + 1);
-
#ifdef HAVE_LIBUSB_1_0
ret = libusb_init(&context->libusb_ctx);
if (LIBUSB_SUCCESS != ret) {
@@ -412,12 +510,15 @@ SR_API int sr_init(struct sr_context **ctx)
goto done;
}
#endif
+ sr_resource_set_hooks(context, NULL, NULL, NULL, NULL);
*ctx = context;
context = NULL;
ret = SR_OK;
+#ifdef HAVE_LIBUSB_1_0
done:
+#endif
g_free(context);
return ret;
}
@@ -439,13 +540,13 @@ SR_API int sr_exit(struct sr_context *ctx)
return SR_ERR;
}
- sr_hw_cleanup_all();
+ sr_hw_cleanup_all(ctx);
#ifdef HAVE_LIBUSB_1_0
libusb_exit(ctx->libusb_ctx);
#endif
- g_free(sr_driver_list());
+ g_free(sr_driver_list(ctx));
g_free(ctx);
return SR_OK;