X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=f58ab7e94ad0a50b24af319604f0606517ac7c21;hb=eabfed20f7cce56a8e92161264817d268216d1aa;hp=4889358a9d6fd9e06fbe6446f76df060e0f429cc;hpb=bd7b83cf631d515ae7e9560400cef2d9f662299a;p=libsigrok.git
diff --git a/src/backend.c b/src/backend.c
index 4889358a..f58ab7e9 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -18,9 +18,12 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#ifdef _WIN32
+#include
+#endif
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -122,7 +125,7 @@
static void print_versions(void)
{
GString *s;
-#ifdef HAVE_LIBUSB_1_0
+#if defined(HAVE_LIBUSB_1_0) && !defined(__FreeBSD__)
const struct libusb_version *lv;
#endif
@@ -137,32 +140,36 @@ static void print_versions(void)
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, ", HAVE_LIBZIP_VER);
+ 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, ", HAVE_LIBFTDI_VER);
+ g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION);
#endif
#ifdef HAVE_LIBGPIB
- g_string_append_printf(s, "libgpib %s, ", HAVE_LIBGPIB_VER);
+ g_string_append_printf(s, "libgpib %s, ", CONF_LIBGPIB_VERSION);
#endif
#ifdef HAVE_LIBREVISA
- g_string_append_printf(s, "librevisa %s, ", HAVE_LIBREVISA_VER);
+ 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, ", HOST);
+ g_string_append_printf(s, "Host: %s, ", CONF_HOST);
#ifdef WORDS_BIGENDIAN
g_string_append_printf(s, "big-endian.");
#else
@@ -250,11 +257,14 @@ 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. */
/* 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++;
@@ -438,6 +448,8 @@ static int sanity_check_all_transform_modules(void)
return ret;
}
+extern struct sr_dev_driver *sr_driver_list_start;
+
/**
* Initialize libsigrok.
*
@@ -458,8 +470,11 @@ SR_API int sr_init(struct sr_context **ctx)
{
int ret = SR_ERR;
struct sr_context *context;
- struct sr_dev_driver ***lists, **drivers;
+ struct sr_dev_driver **drivers;
GArray *array;
+#ifdef _WIN32
+ WSADATA wsadata;
+#endif
print_versions();
@@ -472,9 +487,8 @@ SR_API int sr_init(struct sr_context **ctx)
/* 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);
+ for (drivers = (&sr_driver_list_start) + 1; *drivers; drivers++)
+ g_array_append_val(array, *drivers);
context->driver_list = (struct sr_dev_driver **)array->data;
g_array_free(array, FALSE);
@@ -498,6 +512,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 +528,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 +560,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