X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=ec0c706e97279ee431d516b9a19d4ba81d9d412d;hb=032da34b786333a1af811235c5cf29855479f0b6;hp=21a80224dd60216a809bda635a0eba6028211db9;hpb=9e60a31fb954493754770fe2192db74b947c6867;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 21a80224..ec0c706e 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -31,8 +31,6 @@
 #define LOG_PREFIX "hwdriver"
 /** @endcond */
 
-extern SR_PRIV struct sr_dev_driver **drivers_lists[];
-
 /**
  * @file
  *
@@ -259,26 +257,20 @@ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value)
 /**
  * Return the list of supported hardware drivers.
  *
- * @return Pointer to the NULL-terminated list of hardware driver pointers.
+ * @param[in] ctx Pointer to a libsigrok context struct. Must not be NULL.
+ *
+ * @retval NULL The ctx argument was NULL, or there are no supported drivers.
+ * @retval Other Pointer to the NULL-terminated list of hardware drivers.
+ *               The user should NOT g_free() this list, sr_exit() will do that.
  *
- * @since 0.1.0
+ * @since 0.4.0
  */
-SR_API struct sr_dev_driver **sr_driver_list(void)
+SR_API struct sr_dev_driver **sr_driver_list(const struct sr_context *ctx)
 {
-	static struct sr_dev_driver **combined_list = NULL;
-	struct sr_dev_driver ***lists, **drivers;
-	GArray *array;
-
-	if (!combined_list) {
-		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);
-		combined_list = (struct sr_dev_driver **) array->data;
-		g_array_free(array, FALSE);
-	}
+	if (!ctx)
+		return NULL;
 
-	return combined_list;
+	return ctx->driver_list;
 }
 
 /**
@@ -315,7 +307,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 	}
 
 	sr_spew("Initializing driver '%s'.", driver->name);
-	if ((ret = driver->init(ctx)) < 0)
+	if ((ret = driver->init(driver, ctx)) < 0)
 		sr_err("Failed to initialize the driver: %d.", ret);
 
 	return ret;
@@ -409,7 +401,7 @@ SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 			return NULL;
 	}
 
-	l = driver->scan(options);
+	l = driver->scan(driver, options);
 
 	sr_spew("Scan of '%s' found %d devices.", driver->name,
 		g_slist_length(l));
@@ -417,17 +409,26 @@ SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 	return l;
 }
 
-/** Call driver cleanup function for all drivers.
- *  @private */
-SR_PRIV void sr_hw_cleanup_all(void)
+/**
+ * Call driver cleanup function for all drivers.
+ *
+ * @param[in] ctx Pointer to a libsigrok context struct. Must not be NULL.
+ *
+ * @private
+ */
+SR_PRIV void sr_hw_cleanup_all(const struct sr_context *ctx)
 {
 	int i;
 	struct sr_dev_driver **drivers;
 
-	drivers = sr_driver_list();
+	if (!ctx)
+		return;
+
+	drivers = sr_driver_list(ctx);
 	for (i = 0; drivers[i]; i++) {
 		if (drivers[i]->cleanup)
-			drivers[i]->cleanup();
+			drivers[i]->cleanup(drivers[i]);
+		drivers[i]->priv = NULL;
 	}
 }
 
@@ -462,9 +463,27 @@ SR_PRIV void sr_config_free(struct sr_config *src)
 
 }
 
+static void log_key(const struct sr_dev_inst *sdi,
+	const struct sr_channel_group *cg, uint32_t key, int op, GVariant *data)
+{
+	const char *opstr;
+	const struct sr_config_info *srci;
+
+	/* Don't log SR_CONF_DEVICE_OPTIONS, it's verbose and not too useful. */
+	if (key == SR_CONF_DEVICE_OPTIONS)
+		return;
+
+	opstr = op == SR_CONF_GET ? "get" : op == SR_CONF_SET ? "set" : "list";
+	srci = sr_config_info_get(key);
+
+	sr_spew("sr_config_%s(): key %d (%s) sdi %p cg %s -> %s", opstr, key,
+		srci ? srci->id : "NULL", sdi, cg ? cg->name : "NULL",
+		data ? g_variant_print(data, TRUE) : "NULL");
+}
+
 static int check_key(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi, const struct sr_channel_group *cg,
-		uint32_t key, int op)
+		uint32_t key, int op, GVariant *data)
 {
 	const struct sr_config_info *srci;
 	gsize num_opts, i;
@@ -485,8 +504,20 @@ static int check_key(const struct sr_dev_driver *driver,
 		return SR_ERR_ARG;
 	}
 	opstr = op == SR_CONF_GET ? "get" : op == SR_CONF_SET ? "set" : "list";
-	sr_spew("sr_config_%s(): key %d (%s) sdi %p cg %s", opstr, key,
-			srci->id, sdi, cg ? cg->name : "NULL");
+
+	switch (key) {
+	case SR_CONF_LIMIT_MSEC:
+	case SR_CONF_LIMIT_SAMPLES:
+	case SR_CONF_SAMPLERATE:
+		/* Setting any of these to 0 is not useful. */
+		if (op != SR_CONF_SET || !data)
+			break;
+		if (g_variant_get_uint64(data) == 0) {
+			sr_err("Cannot set '%s' to 0.", srci->id);
+			return SR_ERR_ARG;
+		}
+		break;
+	}
 
 	if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS, &gvar_opts) != SR_OK) {
 		/* Driver publishes no options. */
@@ -552,10 +583,11 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver,
 	if (!driver->config_get)
 		return SR_ERR_ARG;
 
-	if (check_key(driver, sdi, cg, key, SR_CONF_GET) != SR_OK)
+	if (check_key(driver, sdi, cg, key, SR_CONF_GET, NULL) != SR_OK)
 		return SR_ERR_ARG;
 
 	if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) {
+		log_key(sdi, cg, key, SR_CONF_GET, *data);
 		/* Got a floating reference from the driver. Sink it here,
 		 * caller will need to unref when done with it. */
 		g_variant_ref_sink(*data);
@@ -595,10 +627,12 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi,
 		ret = SR_ERR;
 	else if (!sdi->driver->config_set)
 		ret = SR_ERR_ARG;
-	else if (check_key(sdi->driver, sdi, cg, key, SR_CONF_SET) != SR_OK)
+	else if (check_key(sdi->driver, sdi, cg, key, SR_CONF_SET, data) != SR_OK)
 		return SR_ERR_ARG;
-	else if ((ret = sr_variant_type_check(key, data)) == SR_OK)
+	else if ((ret = sr_variant_type_check(key, data)) == SR_OK) {
+		log_key(sdi, cg, key, SR_CONF_SET, data);
 		ret = sdi->driver->config_set(key, data, sdi, cg);
+	}
 
 	g_variant_unref(data);
 
@@ -663,11 +697,13 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver,
 	else if (!driver->config_list)
 		return SR_ERR_ARG;
 	else if (key != SR_CONF_SCAN_OPTIONS && key != SR_CONF_DEVICE_OPTIONS) {
-		if (check_key(driver, sdi, cg, key, SR_CONF_LIST) != SR_OK)
+		if (check_key(driver, sdi, cg, key, SR_CONF_LIST, NULL) != SR_OK)
 			return SR_ERR_ARG;
 	}
-	if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
+	if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK) {
+		log_key(sdi, cg, key, SR_CONF_LIST, *data);
 		g_variant_ref_sink(*data);
+	}
 
 	return ret;
 }