X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=04bb5de66e982e6499f585204f708197536c6886;hb=7a0b98b544ca00f351295f21f895442680b1c014;hp=c6c5645659e44a50d81c230f0b1dcc70a97722a0;hpb=b94dd07b0823ae1607ce8159681a31833a01e199;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index c6c56456..04bb5de6 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -125,18 +125,18 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Number of logic channels", NULL},
 	{SR_CONF_NUM_ANALOG_CHANNELS, SR_T_INT32, "analog_channels",
 		"Number of analog channels", NULL},
-	{SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage",
-		"Current 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_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",
-		"Output channel modes", NULL},
+	{SR_CONF_VOLTAGE, SR_T_FLOAT, "voltage",
+		"Current voltage", NULL},
+	{SR_CONF_VOLTAGE_TARGET, SR_T_FLOAT, "voltage_target",
+		"Voltage target", NULL},
+	{SR_CONF_CURRENT, SR_T_FLOAT, "current",
+		"Current current", NULL},
+	{SR_CONF_CURRENT_LIMIT, SR_T_FLOAT, "current_limit",
+		"Current limit", NULL},
+	{SR_CONF_ENABLED, SR_T_BOOL, "enabled",
+		"Channel enabled", NULL},
+	{SR_CONF_CHANNEL_CONFIG, SR_T_STRING, "channel_config",
+		"Channel modes", NULL},
 	{SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED, SR_T_BOOL, "ovp_enabled",
 		"Over-voltage protection enabled", NULL},
 	{SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE, SR_T_BOOL, "ovp_active",
@@ -153,12 +153,14 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Clock edge", NULL},
 	{SR_CONF_AMPLITUDE, SR_T_FLOAT, "amplitude",
 		"Amplitude", NULL},
-	{SR_CONF_OUTPUT_REGULATION, SR_T_STRING, "output_regulation",
-		"Output channel regulation", NULL},
+	{SR_CONF_REGULATION, SR_T_STRING, "regulation",
+		"Channel regulation", NULL},
 	{SR_CONF_OVER_TEMPERATURE_PROTECTION, SR_T_BOOL, "otp",
 		"Over-temperature protection", NULL},
 	{SR_CONF_OUTPUT_FREQUENCY, SR_T_FLOAT, "output_frequency",
 		"Output frequency", NULL},
+	{SR_CONF_OUTPUT_FREQUENCY_TARGET, SR_T_FLOAT, "output_frequency_target",
+		"Output frequency target", NULL},
 	{SR_CONF_MEASURED_QUANTITY, SR_T_STRING, "measured_quantity",
 		"Measured quantity", NULL},
 	{SR_CONF_MEASURED_2ND_QUANTITY, SR_T_STRING, "measured_2nd_quantity",