X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbackend.c;h=e5fe6a3f764edcce2cb678e92f93a22277b6d486;hb=e4924d752b3a2e08d0ab90b0eb872c569c4c68c9;hp=1e92c2f19993910f093f3bf49373aa290df262ae;hpb=2cbde1519811c36313a9ee8f57c99313c243e911;p=libsigrok.git
diff --git a/src/backend.c b/src/backend.c
index 1e92c2f1..e5fe6a3f 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -18,8 +18,11 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
+#ifdef _WIN32
+#include
+#endif
#include
#include "libsigrok-internal.h"
@@ -119,59 +122,78 @@
* @{
*/
-static void print_versions(void)
+SR_API GSList *sr_buildinfo_libs_get(void)
{
- GString *s;
-#ifdef HAVE_LIBUSB_1_0
+ 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__
+ 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",
+ lv->major, lv->minor, lv->micro, lv->nano, lv->rc));
+#endif
+ 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
@@ -189,11 +211,48 @@ 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 (rt: %s/%s).",
+ SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,
+ 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);
}
/**
@@ -250,11 +309,17 @@ static int sanity_check_all_drivers(const struct sr_context *ctx)
sr_err("No dev_list in driver %d ('%s').", i, d);
errors++;
}
+ 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);
errors++;
}
+ /* Note: config_channel_set() is optional. */
+ /* Note: config_commit() is optional. */
if (!drivers[i]->config_list) {
sr_err("No config_list in driver %d ('%s').", i, d);
errors++;
@@ -458,8 +523,9 @@ 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;
+#ifdef _WIN32
+ WSADATA wsadata;
+#endif
print_versions();
@@ -470,13 +536,7 @@ SR_API int sr_init(struct sr_context **ctx)
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);
+ sr_drivers_init(context);
if (sanity_check_all_drivers(context) < 0) {
sr_err("Internal driver error(s), aborting.");
@@ -498,6 +558,14 @@ SR_API int sr_init(struct sr_context **ctx)
return ret;
}
+#ifdef _WIN32
+ if ((ret = WSAStartup(MAKEWORD(2, 2), &wsadata)) != 0) {
+ sr_err("WSAStartup failed with error code %d.", ret);
+ ret = SR_ERR;
+ goto done;
+ }
+#endif
+
#ifdef HAVE_LIBUSB_1_0
ret = libusb_init(&context->libusb_ctx);
if (LIBUSB_SUCCESS != ret) {
@@ -506,12 +574,13 @@ 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
+#if defined(HAVE_LIBUSB_1_0) || defined(_WIN32)
done:
#endif
g_free(context);
@@ -537,6 +606,10 @@ SR_API int sr_exit(struct sr_context *ctx)
sr_hw_cleanup_all(ctx);
+#ifdef _WIN32
+ WSACleanup();
+#endif
+
#ifdef HAVE_LIBUSB_1_0
libusb_exit(ctx->libusb_ctx);
#endif