X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=b6eae3cc776a979e0fa4871bd8fa52bcaf7593f4;hb=a1eaa9e066ff8d86db8a1fba6615204d442c53d7;hp=5ca3dbe99dc9fece512c1c8afbf96a1f7f5930e2;hpb=ca1a7cb56fbfeeb1c5b27ea87eb8603ca3ca888b;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 5ca3dbe9..b6eae3cc 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -39,8 +39,8 @@ static const int32_t scanopts[] = {
 static const int32_t devopts[] = {
 	SR_CONF_POWER_SUPPLY,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_OUTPUT_CHANNEL,
-	SR_CONF_OVER_CURRENT_PROTECTION,
+	SR_CONF_OUTPUT_CHANNEL_CONFIG,
+	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED,
 };
 
 static const int32_t devopts_cg[] = {
@@ -221,10 +221,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	if (!cg) {
 		/* No channel group: global options. */
 		switch (key) {
-		case SR_CONF_OUTPUT_CHANNEL:
+		case SR_CONF_OUTPUT_CHANNEL_CONFIG:
 			*data = g_variant_new_string(channel_modes[devc->channel_mode]);
 			break;
-		case SR_CONF_OVER_CURRENT_PROTECTION:
+		case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
 			*data = g_variant_new_boolean(devc->over_current_protection);
 			break;
 		default:
@@ -292,7 +292,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	if (!cg) {
 		/* No channel group: global options. */
 		switch (key) {
-		case SR_CONF_OUTPUT_CHANNEL:
+		case SR_CONF_OUTPUT_CHANNEL_CONFIG:
 			sval = g_variant_get_string(data, NULL);
 			if ((ival = find_str(sval, channel_modes,
 							ARRAY_SIZE(channel_modes))) == -1) {
@@ -309,7 +309,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			devc->channel_mode_set = ival;
 			devc->config_dirty = TRUE;
 			break;
-		case SR_CONF_OVER_CURRENT_PROTECTION:
+		case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
 			bval = g_variant_get_boolean(data);
 			if (bval == devc->over_current_protection_set)
 				/* Nothing to do. */
@@ -386,7 +386,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 					devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
 			break;
-		case SR_CONF_OUTPUT_CHANNEL:
+		case SR_CONF_OUTPUT_CHANNEL_CONFIG:
 			if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {
 				/* The 1-channel models. */
 				*data = g_variant_new_strv(channel_modes, 1);