X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fapi.c;h=b5b3bc29f0100dc588c53d3091d6031b3b2d2688;hb=5a7e62211c4714ea2aac35baac10cf448373d4f5;hp=bfc0f62aa6e5b68c4f766d2213308fa95980ce5e;hpb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;p=libsigrok.git

diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c
index bfc0f62a..b5b3bc29 100644
--- a/hardware/hameg-hmo/api.c
+++ b/hardware/hameg-hmo/api.c
@@ -35,10 +35,10 @@ static const int32_t hwopts[] = {
 };
 
 enum {
-	PG_INVALID = -1,
-	PG_NONE,
-	PG_ANALOG,
-	PG_DIGITAL,
+	CG_INVALID = -1,
+	CG_NONE,
+	CG_ANALOG,
+	CG_DIGITAL,
 };
 
 static int init(struct sr_context *sr_ctx)
@@ -192,25 +192,25 @@ static int check_channel_group(struct dev_context *devc,
 	model = devc->model_config;
 
 	if (!cg)
-		return PG_NONE;
+		return CG_NONE;
 
 	for (i = 0; i < model->analog_channels; ++i)
 		if (cg == &devc->analog_groups[i])
-			return PG_ANALOG;
+			return CG_ANALOG;
 
 	for (i = 0; i < model->digital_pods; ++i)
 		if (cg == &devc->digital_groups[i])
-			return PG_DIGITAL;
+			return CG_DIGITAL;
 
 	sr_err("Invalid channel group specified.");
 
-	return PG_INVALID;
+	return CG_INVALID;
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		      const struct sr_channel_group *cg)
 {
-	int ret, pg_type;
+	int ret, cg_type;
 	unsigned int i;
 	struct dev_context *devc;
 	struct scope_config *model;
@@ -219,7 +219,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	ret = SR_ERR_NA;
@@ -237,10 +237,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		ret = SR_OK;
 		break;
 	case SR_CONF_NUM_VDIV:
-		if (pg_type == PG_NONE) {
+		if (cg_type == CG_NONE) {
 			sr_err("No channel group specified.");
 			return SR_ERR_CHANNEL_GROUP;
-		} else if (pg_type == PG_ANALOG) {
+		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
 				if (cg != &devc->analog_groups[i])
 					continue;
@@ -254,12 +254,12 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		}
 		break;
 	case SR_CONF_VDIV:
-		if (pg_type == PG_NONE) {
-			sr_err("No probe group specified.");
-			return SR_ERR_PROBE_GROUP;
-		} else if (pg_type == PG_ANALOG) {
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
+		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
-				if (probe_group != &devc->analog_groups[i])
+				if (cg != &devc->analog_groups[i])
 					continue;
 				*data = g_variant_new("(tt)",
 						      (*model->vdivs)[state->analog_channels[i].vdiv][0],
@@ -285,10 +285,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		ret = SR_OK;
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE) {
+		if (cg_type == CG_NONE) {
 			sr_err("No channel group specified.");
 			return SR_ERR_CHANNEL_GROUP;
-		} else if (pg_type == PG_ANALOG) {
+		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
 				if (cg != &devc->analog_groups[i])
 					continue;
@@ -334,7 +334,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		      const struct sr_channel_group *cg)
 {
-	int ret, pg_type;
+	int ret, cg_type;
 	unsigned int i, j;
 	char command[MAX_COMMAND_SIZE], float_str[30];
 	struct dev_context *devc;
@@ -348,7 +348,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	model = devc->model_config;
@@ -377,7 +377,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		}
 		break;
 	case SR_CONF_VDIV:
-		if (pg_type == PG_NONE) {
+		if (cg_type == CG_NONE) {
 			sr_err("No channel group specified.");
 			return SR_ERR_CHANNEL_GROUP;
 		}
@@ -460,7 +460,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		ret = sr_scpi_send(sdi->conn, command);
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE) {
+		if (cg_type == CG_NONE) {
 			sr_err("No channel group specified.");
 			return SR_ERR_CHANNEL_GROUP;
 		}
@@ -506,25 +506,25 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		       const struct sr_channel_group *cg)
 {
-	int pg_type;
+	int cg_type;
 	struct dev_context *devc;
 	struct scope_config *model;
 
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	model = devc->model_config;
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
-		if (pg_type == PG_NONE) {
+		if (cg_type == CG_NONE) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				model->hw_caps, model->num_hwcaps,
 				sizeof(int32_t));
-		} else if (pg_type == PG_ANALOG) {
+		} else if (cg_type == CG_ANALOG) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				model->analog_hwcaps, model->num_analog_hwcaps,
 				sizeof(int32_t));
@@ -534,7 +534,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		}
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE)
+		if (cg_type == CG_NONE)
 			return SR_ERR_CHANNEL_GROUP;
 		*data = g_variant_new_strv(*model->coupling_options,
 			   g_strv_length((char **)*model->coupling_options));
@@ -551,7 +551,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = build_tuples(model->timebases, model->num_timebases);
 		break;
 	case SR_CONF_VDIV:
-		if (pg_type == PG_NONE)
+		if (cg_type == CG_NONE)
 			return SR_ERR_CHANNEL_GROUP;
 		*data = build_tuples(model->vdivs, model->num_vdivs);
 		break;
@@ -575,12 +575,12 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
 	ch = devc->current_channel->data;
 
 	switch (ch->type) {
-	case SR_PROBE_ANALOG:
+	case SR_CHANNEL_ANALOG:
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_GET_ANALOG_DATA],
 			   ch->index + 1);
 		break;
-	case SR_PROBE_LOGIC:
+	case SR_CHANNEL_LOGIC:
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_GET_DIG_DATA],
 			   ch->index < 8 ? 1 : 2);
@@ -604,13 +604,13 @@ static int hmo_check_channels(GSList *channels)
 	for (l = channels; l; l = l->next) {
 		ch = l->data;
 		switch (ch->type) {
-		case SR_PROBE_ANALOG:
+		case SR_CHANNEL_ANALOG:
 			if (ch->index == 2)
 				enabled_chan3 = TRUE;
 			else if (ch->index == 3)
 				enabled_chan4 = TRUE;
 			break;
-		case SR_PROBE_LOGIC:
+		case SR_CHANNEL_LOGIC:
 			if (ch->index < 8)
 				enabled_pod1 = TRUE;
 			else
@@ -651,7 +651,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 	for (l = sdi->channels; l; l = l->next) {
 		ch = l->data;
 		switch (ch->type) {
-		case SR_PROBE_ANALOG:
+		case SR_CHANNEL_ANALOG:
 			if (ch->enabled == state->analog_channels[ch->index].state)
 				break;
 			g_snprintf(command, sizeof(command),
@@ -663,7 +663,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 			state->analog_channels[ch->index].state = ch->enabled;
 			setup_changed = TRUE;
 			break;
-		case SR_PROBE_LOGIC:
+		case SR_CHANNEL_LOGIC:
 			/*
 			 * A digital POD needs to be enabled for every group of
 			 * 8 channels.
@@ -728,10 +728,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		if (!ch->enabled)
 			continue;
 		/* Only add a single digital channel. */
-		if (ch->type != SR_PROBE_LOGIC || !digital_added) {
+		if (ch->type != SR_CHANNEL_LOGIC || !digital_added) {
 			devc->enabled_channels = g_slist_append(
 					devc->enabled_channels, ch);
-			if (ch->type == SR_PROBE_LOGIC)
+			if (ch->type == SR_CHANNEL_LOGIC)
 				digital_added = TRUE;
 		}
 	}