X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=379478a0704dd73b4ed366e767f57ba06146d21e;hb=815685462fdab21a390b5aecc253b92753439f06;hp=baf1f8d97fe4c037d2feaa45327c9acbf530483e;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git

diff --git a/src/backend.c b/src/backend.c
index baf1f8d9..379478a0 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -18,8 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -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++;
@@ -458,8 +468,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 +481,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 +503,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 +519,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 +551,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