Add helper function for scan completion

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index 8084a1c54dbca7dd9783f46666ae01ad31baaa51..f58ab7e94ad0a50b24af319604f0606517ac7c21 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,6 +20,9 @@
 
 #include <config.h>
 #include <glib.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -254,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++;
@@ -442,6 +448,8 @@ static int sanity_check_all_transform_modules(void)
        return ret;
 }
 
+extern struct sr_dev_driver *sr_driver_list_start;
+
 /**
  * Initialize libsigrok.
  *
@@ -462,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();
 
@@ -476,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);
 
@@ -502,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) {
@@ -510,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);
@@ -541,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