X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhwdriver.c;h=b1e0c3e68730a10237545e0db042cd598eff27ad;hp=604206e3b8718858a603d537c0e5054038375e67;hb=bf622e6d00e7985e36a0ddb643e2bf05d66679a6;hpb=071151b578821a5019d718ad03db81b2cef3245e

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 604206e3..b1e0c3e6 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -47,9 +47,10 @@ extern SR_PRIV struct sr_dev_driver *drivers_list[];
  * @{
  */
 
+/* Same key order/grouping as in enum sr_configkey (libsigrok.h). */
 static struct sr_config_info sr_config_info_data[] = {
-	/* Device types */
-	{SR_CONF_LOGIC_ANALYZER, SR_T_STRING, NULL, "Logic Analyzer", NULL},
+	/* Device classes */
+	{SR_CONF_LOGIC_ANALYZER, SR_T_STRING, NULL, "Logic analyzer", NULL},
 	{SR_CONF_OSCILLOSCOPE, SR_T_STRING, NULL, "Oscilloscope", NULL},
 	{SR_CONF_MULTIMETER, SR_T_STRING, NULL, "Multimeter", NULL},
 	{SR_CONF_DEMO_DEV, SR_T_STRING, NULL, "Demo device", NULL},
@@ -61,39 +62,27 @@ static struct sr_config_info sr_config_info_data[] = {
 	{SR_CONF_POWER_SUPPLY, SR_T_STRING, NULL, "Power supply", NULL},
 	{SR_CONF_LCRMETER, SR_T_STRING, NULL, "LCR meter", NULL},
 
-	/* Sample limiting */
-	{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
-		"Sample limit", NULL},
-	{SR_CONF_LIMIT_MSEC, SR_T_UINT64, "limit_time",
-		"Time limit", NULL},
-	{SR_CONF_LIMIT_FRAMES, SR_T_UINT64, "limit_frames",
-		"Frame limit", NULL},
-	{SR_CONF_CONTINUOUS, SR_T_UINT64, "continuous",
-		"Continuous sampling", NULL},
-
-	/* Scan options */
+	/* Driver scan options */
 	{SR_CONF_CONN, SR_T_STRING, "conn",
 		"Connection", NULL},
 	{SR_CONF_SERIALCOMM, SR_T_STRING, "serialcomm",
 		"Serial communication", NULL},
 
-	/* Device/channel group options */
+	/* Device (or channel group) configuration */
 	{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
 		"Sample rate", NULL},
 	{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
 		"Pre-trigger capture ratio", NULL},
 	{SR_CONF_PATTERN_MODE, SR_T_STRING, "pattern",
 		"Pattern", NULL},
-	{SR_CONF_TRIGGER_MATCH, SR_T_INT32, "triggermatch",
-		"Trigger matches", NULL},
-	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
-		"External clock mode", NULL},
-	{SR_CONF_SWAP, SR_T_BOOL, "swap",
-		"Swap channel order", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
-		"Run Length Encoding", NULL},
+		"Run length encoding", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
 		"Trigger slope", NULL},
+	{SR_CONF_AVERAGING, SR_T_BOOL, "averaging",
+		"Averaging", NULL},
+	{SR_CONF_AVG_SAMPLES, SR_T_UINT64, "avg_samples",
+		"Number of samples to average over", NULL},
 	{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
 		"Trigger source", NULL},
 	{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
@@ -108,24 +97,32 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Volts/div", NULL},
 	{SR_CONF_COUPLING, SR_T_STRING, "coupling",
 		"Coupling", NULL},
-	{SR_CONF_DATALOG, SR_T_BOOL, "datalog",
-		"Datalog", NULL},
+	{SR_CONF_TRIGGER_MATCH, SR_T_INT32, "triggermatch",
+		"Trigger matches", NULL},
+	{SR_CONF_SAMPLE_INTERVAL, SR_T_UINT64, "sample_interval",
+		"Sample interval", NULL},
+	{SR_CONF_NUM_HDIV, SR_T_INT32, "num_hdiv",
+		"Number of horizontal divisions", NULL},
+	{SR_CONF_NUM_VDIV, SR_T_INT32, "num_vdiv",
+		"Number of vertical divisions", NULL},
 	{SR_CONF_SPL_WEIGHT_FREQ, SR_T_STRING, "spl_weight_freq",
 		"Sound pressure level frequency weighting", NULL},
 	{SR_CONF_SPL_WEIGHT_TIME, SR_T_STRING, "spl_weight_time",
 		"Sound pressure level time weighting", NULL},
+	{SR_CONF_SPL_MEASUREMENT_RANGE, SR_T_UINT64_RANGE, "spl_meas_range",
+		"Sound pressure level measurement range", NULL},
 	{SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
 		"Hold max", NULL},
 	{SR_CONF_HOLD_MIN, SR_T_BOOL, "hold_min",
 		"Hold min", NULL},
-	{SR_CONF_SPL_MEASUREMENT_RANGE, SR_T_UINT64_RANGE, "spl_meas_range",
-		"Sound pressure level measurement range", NULL},
 	{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
 		"Voltage threshold", NULL },
-	{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
-		"Power off", NULL},
-	{SR_CONF_DATA_SOURCE, SR_T_STRING, "data_source",
-		"Data source", NULL},
+	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
+		"External clock mode", NULL},
+	{SR_CONF_SWAP, SR_T_BOOL, "swap",
+		"Swap channel order", NULL},
+	{SR_CONF_CENTER_FREQUENCY, SR_T_UINT64, "center_frequency",
+		"Center frequency", NULL},
 	{SR_CONF_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels",
 		"Number of logic channels", NULL},
 	{SR_CONF_NUM_ANALOG_CHANNELS, SR_T_INT32, "analog_channels",
@@ -158,10 +155,10 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Clock edge", NULL},
 	{SR_CONF_AMPLITUDE, SR_T_FLOAT, "amplitude",
 		"Amplitude", NULL},
-	{SR_CONF_OVER_TEMPERATURE_PROTECTION, SR_T_BOOL, "otp",
-		"Over-temperature protection", NULL},
 	{SR_CONF_OUTPUT_REGULATION, SR_T_STRING, "output_regulation",
 		"Output channel regulation", NULL},
+	{SR_CONF_OVER_TEMPERATURE_PROTECTION, SR_T_BOOL, "otp",
+		"Over-temperature protection", NULL},
 	{SR_CONF_OUTPUT_FREQUENCY, SR_T_UINT64, "output_frequency",
 		"Output frequency", NULL},
 	{SR_CONF_MEASURED_QUANTITY, SR_T_STRING, "measured_quantity",
@@ -170,6 +167,41 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Measured secondary quantity", NULL},
 	{SR_CONF_EQUIV_CIRCUIT_MODEL, SR_T_STRING, "equiv_circuit_model",
 		"Equivalent circuit model", NULL},
+
+	/* Special stuff */
+	{SR_CONF_SCAN_OPTIONS, SR_T_STRING, "scan_options",
+		"Scan options", NULL},
+	{SR_CONF_DEVICE_OPTIONS, SR_T_STRING, "device_options",
+		"Device options", NULL},
+	{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",
+		"Session file", NULL},
+	{SR_CONF_CAPTUREFILE, SR_T_STRING, "capturefile",
+		"Capture file", NULL},
+	{SR_CONF_CAPTURE_UNITSIZE, SR_T_UINT64, "capture_unitsize",
+		"Capture unitsize", NULL},
+	{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
+		"Power off", NULL},
+	{SR_CONF_DATA_SOURCE, SR_T_STRING, "data_source",
+		"Data source", NULL},
+	{SR_CONF_PROBE_FACTOR, SR_T_UINT64, "probe_factor",
+		"Probe factor", NULL},
+
+	/* Acquisition modes, sample limiting */
+	{SR_CONF_LIMIT_MSEC, SR_T_UINT64, "limit_time",
+		"Time limit", NULL},
+	{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
+		"Sample limit", NULL},
+	{SR_CONF_LIMIT_FRAMES, SR_T_UINT64, "limit_frames",
+		"Frame limit", NULL},
+	{SR_CONF_CONTINUOUS, SR_T_UINT64, "continuous",
+		"Continuous sampling", NULL},
+	{SR_CONF_DATALOG, SR_T_BOOL, "datalog",
+		"Datalog", NULL},
+	{SR_CONF_DEVICE_MODE, SR_T_STRING, "device_mode",
+		"Device mode", NULL},
+	{SR_CONF_TEST_MODE, SR_T_STRING, "test_mode",
+		"Test mode", NULL},
+
 	{0, 0, NULL, NULL, NULL},
 };
 
@@ -277,6 +309,50 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 	return ret;
 }
 
+static int check_options(struct sr_dev_driver *driver, GSList *options,
+		uint32_t optlist_key, struct sr_dev_inst *sdi,
+		struct sr_channel_group *cg)
+{
+	struct sr_config *src;
+	const struct sr_config_info *srci;
+	GVariant *gvar_opts;
+	GSList *l;
+	const uint32_t *opts;
+	gsize num_opts, i;
+	int ret;
+
+	if (sr_config_list(driver, sdi, cg, optlist_key, &gvar_opts) != SR_OK) {
+		/* Driver publishes no options for this optlist. */
+		return SR_ERR;
+	}
+
+	ret = SR_OK;
+	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+	for (l = options; l; l = l->next) {
+		src = l->data;
+		for (i = 0; i < num_opts; i++) {
+			if (opts[i] == src->key)
+				break;
+		}
+		if (i == num_opts) {
+			if (!(srci = sr_config_info_get(src->key)))
+				/* Shouldn't happen. */
+				sr_err("Invalid option %d.", src->key);
+			else
+				sr_err("Invalid option '%s'.", srci->id);
+			ret = SR_ERR_ARG;
+			break;
+		}
+		if (sr_variant_type_check(src->key, src->data) != SR_OK) {
+			ret = SR_ERR_ARG;
+			break;
+		}
+	}
+	g_variant_unref(gvar_opts);
+
+	return ret;
+}
+
 /**
  * Tell a hardware driver to scan for devices.
  *
@@ -304,13 +380,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
  */
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 {
-	struct sr_config *src;
-	const struct sr_config_info *srci;
 	GSList *l;
-	GVariant *gvar_opts;
-	const uint32_t *opts;
-	gsize num_opts, i;
-	int ret;
 
 	if (!driver) {
 		sr_err("Invalid driver, can't scan for devices.");
@@ -322,33 +392,10 @@ SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 		return NULL;
 	}
 
-	ret = sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS, &gvar_opts);
-	if (ret != SR_OK && options) {
-		/* Driver publishes no scan options but some were given. */
-		sr_err("Driver does not support scan options.");
-		return NULL;
-	}
-	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
-	for (l = options; l; l = l->next) {
-		src = l->data;
-		for (i = 0; i < num_opts; i++) {
-			if (opts[i] == src->key)
-				break;
-		}
-		if (i == num_opts) {
-			if (!(srci = sr_config_info_get(src->key)))
-				sr_err("Driver does not support scan option %d.", src->key);
-			else
-				sr_err("Driver does not support scan option '%s'.", srci->id);
-			g_variant_unref(gvar_opts);
-			return NULL;
-		}
-		if (sr_variant_type_check(src->key, src->data) != SR_OK) {
-			g_variant_unref(gvar_opts);
+	if (options) {
+		if (check_options(driver, options, SR_CONF_SCAN_OPTIONS, NULL, NULL) != SR_OK)
 			return NULL;
-		}
 	}
-	g_variant_unref(gvar_opts);
 
 	l = driver->scan(options);
 
@@ -380,8 +427,7 @@ SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data)
 {
 	struct sr_config *src;
 
-	if (!(src = g_try_malloc(sizeof(struct sr_config))))
-		return NULL;
+	src = g_malloc0(sizeof(struct sr_config));
 	src->key = key;
 	src->data = g_variant_ref_sink(data);
 
@@ -404,6 +450,59 @@ SR_PRIV void sr_config_free(struct sr_config *src)
 
 }
 
+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)
+{
+	const struct sr_config_info *srci;
+	gsize num_opts, i;
+	GVariant *gvar_opts;
+	const uint32_t *opts;
+	uint32_t pub_opt;
+	char *suffix, *opstr;
+
+	if (sdi && cg)
+		suffix = " for this device and channel group";
+	else if (sdi)
+		suffix = " for this device";
+	else
+		suffix = "";
+
+	if (!(srci = sr_config_info_get(key))) {
+		sr_err("Invalid key %d.", key);
+		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");
+
+	if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS, &gvar_opts) != SR_OK) {
+		/* Driver publishes no options. */
+		sr_err("No options available%s.", srci->id, suffix);
+		return SR_ERR_ARG;
+	}
+	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+	pub_opt = 0;
+	for (i = 0; i < num_opts; i++) {
+		if ((opts[i] & SR_CONF_MASK) == key) {
+			pub_opt = opts[i];
+			break;
+		}
+	}
+	g_variant_unref(gvar_opts);
+	if (!pub_opt) {
+		sr_err("Option '%s' not available%s.", srci->id, suffix);
+		return SR_ERR_ARG;
+	}
+
+	if (!(pub_opt & op)) {
+		sr_err("Option '%s' not available to %s%s.", srci->id, opstr, suffix);
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 /**
  * Query value of a configuration key at the given driver or device instance.
  *
@@ -441,6 +540,9 @@ 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)
+		return SR_ERR_ARG;
+
 	if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) {
 		/* Got a floating reference from the driver. Sink it here,
 		 * caller will need to unref when done with it. */
@@ -481,6 +583,8 @@ 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)
+		return SR_ERR_ARG;
 	else if ((ret = sr_variant_type_check(key, data)) == SR_OK)
 		ret = sdi->driver->config_set(key, data, sdi, cg);
 
@@ -543,10 +647,14 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver,
 	int ret;
 
 	if (!driver || !data)
-		ret = SR_ERR;
+		return SR_ERR;
 	else if (!driver->config_list)
-		ret = SR_ERR_ARG;
-	else if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
+		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)
+			return SR_ERR_ARG;
+	}
+	if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
 		g_variant_ref_sink(*data);
 
 	return ret;