X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fapi.c;h=81370e9f9007382fbb79409c1f6d5c04a0d40f80;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=b9e6524b482b139d4a840abcb57205b1fcbad09a;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index b9e6524b..81370e9f 100644
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -39,20 +39,20 @@ static const uint32_t scanopts[] = {
 static const uint32_t devopts[] = {
 	/* Device class */
 	SR_CONF_POWER_SUPPLY,
-	/* Aquisition modes. */
+	/* Acquisition modes. */
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 	/* Device configuration */
-	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
-	SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
-	SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_VOLTAGE | SR_CONF_GET,
+	SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_CURRENT | SR_CONF_GET,
+	SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
 /* Note: All models have one power supply output only. */
-static struct hcs_model models[] = {
+static const struct hcs_model models[] = {
 	{ MANSON_HCS_3100, "HCS-3100",     "3100", { 1, 18, 0.1 }, { 0, 10,   0.10 } },
 	{ MANSON_HCS_3102, "HCS-3102",     "3102", { 1, 36, 0.1 }, { 0,  5,   0.01 } },
 	{ MANSON_HCS_3104, "HCS-3104",     "3104", { 1, 60, 0.1 }, { 0,  2.5, 0.01 } },
@@ -96,7 +96,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	struct sr_serial_dev_inst *serial;
 	char reply[50], **tokens, *dummy;
 
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 	devices = NULL;
 	conn = NULL;
@@ -197,14 +197,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 exit_err:
 	sr_dev_inst_free(sdi);
-	if (devc)
-		g_free(devc);
+	g_free(devc);
+
 	return NULL;
 }
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int cleanup(const struct sr_dev_driver *di)
@@ -231,19 +231,19 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	case SR_CONF_LIMIT_MSEC:
 		*data = g_variant_new_uint64(devc->limit_msec);
 		break;
-	case SR_CONF_OUTPUT_VOLTAGE:
+	case SR_CONF_VOLTAGE:
 		*data = g_variant_new_double(devc->voltage);
 		break;
-	case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+	case SR_CONF_VOLTAGE_TARGET:
 		*data = g_variant_new_double(devc->voltage_max);
 		break;
-	case SR_CONF_OUTPUT_CURRENT:
+	case SR_CONF_CURRENT:
 		*data = g_variant_new_double(devc->current);
 		break;
-	case SR_CONF_OUTPUT_CURRENT_LIMIT:
+	case SR_CONF_CURRENT_LIMIT:
 		*data = g_variant_new_double(devc->current_max);
 		break;
-	case SR_CONF_OUTPUT_ENABLED:
+	case SR_CONF_ENABLED:
 		*data = g_variant_new_boolean(devc->output_enabled);
 		break;
 	default:
@@ -278,7 +278,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			return SR_ERR_ARG;
 		devc->limit_samples = g_variant_get_uint64(data);
 		break;
-	case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+	case SR_CONF_VOLTAGE_TARGET:
 		dval = g_variant_get_double(data);
 		if (dval < devc->model->voltage[0] || dval > devc->voltage_max_device)
 			return SR_ERR_ARG;
@@ -289,7 +289,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			return SR_ERR;
 		devc->voltage_max = dval;
 		break;
-	case SR_CONF_OUTPUT_CURRENT_LIMIT:
+	case SR_CONF_CURRENT_LIMIT:
 		dval = g_variant_get_double(data);
 		if (dval < devc->model->current[0] || dval > devc->current_max_device)
 			return SR_ERR_ARG;
@@ -300,7 +300,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			return SR_ERR;
 		devc->current_max = dval;
 		break;
-	case SR_CONF_OUTPUT_ENABLED:
+	case SR_CONF_ENABLED:
 		bval = g_variant_get_boolean(data);
 		if (bval == devc->output_enabled) /* Nothing to do. */
 			break;
@@ -351,7 +351,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
 		break;
-	case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+	case SR_CONF_VOLTAGE_TARGET:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
 		/* Min, max, step. */
 		for (idx = 0; idx < 3; idx++) {
@@ -364,7 +364,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		}
 		*data = g_variant_builder_end(&gvb);
 		break;
-	case SR_CONF_OUTPUT_CURRENT_LIMIT:
+	case SR_CONF_CURRENT_LIMIT:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
 		/* Min, max, step. */
 		for (idx = 0; idx < 3; idx++) {
@@ -433,5 +433,5 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };