X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=f9649f0c489666a5a4c9f7f039019bf93cdb4fce;hb=a700a3a4bfef6c92a2085ae5e611fabfb639878a;hp=bf0ce04dafd3b0ad0a8971fcafa8726644325c13;hpb=13fef1ed246930715b5a020b17fe79313cf5eed4;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index bf0ce04d..f9649f0c 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -48,10 +48,36 @@ extern SR_PRIV struct sr_dev_driver *drivers_list[];
  */
 
 static struct sr_config_info sr_config_info_data[] = {
+	/* Device types */
+	{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},
+	{SR_CONF_SOUNDLEVELMETER, SR_T_STRING, NULL, "Sound level meter", NULL},
+	{SR_CONF_THERMOMETER, SR_T_STRING, NULL, "Thermometer", NULL},
+	{SR_CONF_HYGROMETER, SR_T_STRING, NULL, "Hygrometer", NULL},
+	{SR_CONF_ENERGYMETER, SR_T_STRING, NULL, "Energy meter", NULL},
+	{SR_CONF_DEMODULATOR, SR_T_STRING, NULL, "Demodulator", NULL},
+	{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 */
 	{SR_CONF_CONN, SR_T_STRING, "conn",
 		"Connection", NULL},
 	{SR_CONF_SERIALCOMM, SR_T_STRING, "serialcomm",
 		"Serial communication", NULL},
+
+	/* Device/channel group options */
 	{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
 		"Sample rate", NULL},
 	{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
@@ -106,12 +132,12 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Number of analog channels", NULL},
 	{SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage",
 		"Current output voltage", NULL},
-	{SR_CONF_OUTPUT_VOLTAGE_MAX, SR_T_FLOAT, "output_voltage_max",
-		"Maximum output voltage", NULL},
+	{SR_CONF_OUTPUT_VOLTAGE_TARGET, SR_T_FLOAT, "output_voltage_target",
+		"Output voltage target", NULL},
 	{SR_CONF_OUTPUT_CURRENT, SR_T_FLOAT, "output_current",
 		"Current output current", NULL},
-	{SR_CONF_OUTPUT_CURRENT_MAX, SR_T_FLOAT, "output_current_max",
-		"Maximum output current", NULL},
+	{SR_CONF_OUTPUT_CURRENT_LIMIT, SR_T_FLOAT, "output_current_limit",
+		"Output current limit", NULL},
 	{SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled",
 		"Output enabled", NULL},
 	{SR_CONF_OUTPUT_CHANNEL_CONFIG, SR_T_STRING, "output_channel_config",
@@ -128,8 +154,6 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Over-current protection active", NULL},
 	{SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD, SR_T_FLOAT, "ocp_threshold",
 		"Over-current protection threshold", NULL},
-	{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
-		"Sample limit", NULL},
 	{SR_CONF_CLOCK_EDGE, SR_T_STRING, "clock_edge",
 		"Clock edge", NULL},
 	{SR_CONF_AMPLITUDE, SR_T_FLOAT, "amplitude",
@@ -138,6 +162,14 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Over-temperature protection", NULL},
 	{SR_CONF_OUTPUT_REGULATION, SR_T_STRING, "output_regulation",
 		"Output channel regulation", NULL},
+	{SR_CONF_OUTPUT_FREQUENCY, SR_T_UINT64, "output_frequency",
+		"Output frequency", NULL},
+	{SR_CONF_MEASURED_QUANTITY, SR_T_STRING, "measured_quantity",
+		"Measured quantity", NULL},
+	{SR_CONF_MEASURED_2ND_QUANTITY, SR_T_STRING, "measured_2nd_quantity",
+		"Measured secondary quantity", NULL},
+	{SR_CONF_EQUIV_CIRCUIT_MODEL, SR_T_STRING, "equiv_circuit_model",
+		"Equivalent circuit model", NULL},
 	{0, 0, NULL, NULL, NULL},
 };
 
@@ -166,24 +198,29 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
 	}
 }
 
-SR_PRIV int sr_variant_type_check(int key, GVariant *value)
+SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value)
 {
 	const struct sr_config_info *info;
 	const GVariantType *type, *expected;
+	char *expected_string, *type_string;
+
 	info = sr_config_info_get(key);
 	if (!info)
 		return SR_OK;
+
 	expected = sr_variant_type_get(info->datatype);
 	type = g_variant_get_type(value);
-	if (!g_variant_type_equal(type, expected)) {
-		gchar *expected_string = g_variant_type_dup_string(expected);
-		gchar *type_string = g_variant_type_dup_string(type);
+	if (!g_variant_type_equal(type, expected)
+			&& !g_variant_type_is_subtype_of(type, expected)) {
+		expected_string = g_variant_type_dup_string(expected);
+		type_string = g_variant_type_dup_string(type);
 		sr_err("Wrong variant type for key '%s': expected '%s', got '%s'",
 			info->name, expected_string, type_string);
 		g_free(expected_string);
 		g_free(type_string);
 		return SR_ERR_ARG;
 	}
+
 	return SR_OK;
 }
 
@@ -312,7 +349,7 @@ SR_PRIV void sr_hw_cleanup_all(void)
  *  A floating reference can be passed in for data.
  *  @private
  */
-SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
+SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data)
 {
 	struct sr_config *src;
 
@@ -367,7 +404,7 @@ SR_PRIV void sr_config_free(struct sr_config *src)
 SR_API int sr_config_get(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg,
-		int key, GVariant **data)
+		uint32_t key, GVariant **data)
 {
 	int ret;
 
@@ -407,7 +444,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver,
  */
 SR_API int sr_config_set(const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg,
-		int key, GVariant *data)
+		uint32_t key, GVariant *data)
 {
 	int ret;
 
@@ -474,7 +511,7 @@ SR_API int sr_config_commit(const struct sr_dev_inst *sdi)
 SR_API int sr_config_list(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg,
-		int key, GVariant **data)
+		uint32_t key, GVariant **data)
 {
 	int ret;
 
@@ -498,7 +535,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver,
  *
  * @since 0.2.0
  */
-SR_API const struct sr_config_info *sr_config_info_get(int key)
+SR_API const struct sr_config_info *sr_config_info_get(uint32_t key)
 {
 	int i;
 
@@ -525,6 +562,8 @@ SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
 	int i;
 
 	for (i = 0; sr_config_info_data[i].key; i++) {
+		if (!sr_config_info_data[i].id)
+			continue;
 		if (!strcmp(sr_config_info_data[i].id, optname))
 			return &sr_config_info_data[i];
 	}