X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fbackend.c;h=aa51a92d480636d932687cb474f9bffbe9d654d8;hb=36dacf17bc5fe333c6557d073011e2033b6f544f;hp=5d0a0c9396d35eff2a4a58c3da128a0f846ab541;hpb=731c01f248b8b7b9bd87e6b21ee92f806eff762b;p=libsigrok.git
diff --git a/src/backend.c b/src/backend.c
index 5d0a0c93..aa51a92d 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"
@@ -464,6 +467,9 @@ SR_API int sr_init(struct sr_context **ctx)
struct sr_context *context;
struct sr_dev_driver ***lists, **drivers;
GArray *array;
+#ifdef _WIN32
+ WSADATA wsadata;
+#endif
print_versions();
@@ -502,6 +508,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 +524,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 +556,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