X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=61c71ea8320d0101992180d6fd5970d656d4360b;hb=e57057aee778e723da572a6b5e2bd01526cc7beb;hp=eb5bbc19b39aca02da04e8f9d1f0aee00af2484c;hpb=2dcf82e9cb486dc235c1e0b96334d4edb0f19130;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index eb5bbc19..61c71ea8 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -18,7 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
+#include "scpi.h"
 #include "protocol.h"
 
 SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info;
@@ -127,12 +129,12 @@ fail:
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-	return sr_scpi_scan(di->priv, options, probe_usbtmc_device);
+	return sr_scpi_scan(di->context, options, probe_usbtmc_device);
 }
 
 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 void clear_helper(void *priv)
@@ -189,10 +191,10 @@ static int cleanup(const struct sr_dev_driver *di)
  * Check which category a given channel group belongs to.
  *
  * @param devc Our internal device context.
- * @param cg   The channel group to check.
+ * @param cg The channel group to check.
  *
- * @retval CG_NONE    cg is NULL
- * @retval CG_ANALOG  cg is an analog group
+ * @retval CG_NONE cg is NULL
+ * @retval CG_ANALOG cg is an analog group
  * @retval CG_DIGITAL cg is a digital group
  * @retval CG_INVALID cg is something else
  */
@@ -207,11 +209,11 @@ static int check_channel_group(struct dev_context *devc,
 	if (!cg)
 		return CG_NONE;
 
-	for (i = 0; i < model->analog_channels; ++i)
+	for (i = 0; i < model->analog_channels; i++)
 		if (cg == devc->analog_groups[i])
 			return CG_ANALOG;
 
-	for (i = 0; i < model->pods; ++i)
+	for (i = 0; i < model->pods; i++)
 		if (cg == devc->digital_groups[i])
 			return CG_DIGITAL;
 
@@ -234,7 +236,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
-	ret = SR_ERR_NA;
 	model = devc->model_config;
 	state = devc->model_state;
 
@@ -269,7 +270,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		} else if (cg_type != CG_ANALOG)
 			break;
 
-		for (i = 0; i < model->analog_channels; ++i) {
+		for (i = 0; i < model->analog_channels; i++) {
 			if (cg != devc->analog_groups[i])
 				continue;
 			*data = g_variant_new("(tt)",
@@ -299,7 +300,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		} else if (cg_type != CG_ANALOG)
 			break;
 
-		for (i = 0; i < model->analog_channels; ++i) {
+		for (i = 0; i < model->analog_channels; i++) {
 			if (cg != devc->analog_groups[i])
 				continue;
 			*data = g_variant_new_string((*model->coupling_options)[state->analog_states[i].coupling]);
@@ -391,7 +392,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			if (p != dlm_vdivs[i][0] ||
 					q != dlm_vdivs[i][1])
 				continue;
-			for (j = 1; j <= model->analog_channels; ++j) {
+			for (j = 1; j <= model->analog_channels; j++) {
 				if (cg != devc->analog_groups[j - 1])
 					continue;
 				state->analog_states[j - 1].vdiv = i;
@@ -462,7 +463,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		for (i = 0; (*model->coupling_options)[i]; i++) {
 			if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
 				continue;
-			for (j = 1; j <= model->analog_channels; ++j) {
+			for (j = 1; j <= model->analog_channels; j++) {
 				if (cg != devc->analog_groups[j - 1])
 					continue;
 				state->analog_states[j-1].coupling = i;
@@ -494,7 +495,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_channel_set(const struct sr_dev_inst *sdi,
 			struct sr_channel *ch, unsigned int changes)
 {
-	/* Curretly we only handle SR_CHANNEL_SET_ENABLED. */
+	/* Currently we only handle SR_CHANNEL_SET_ENABLED. */
 	if (changes != SR_CHANNEL_SET_ENABLED)
 		return SR_ERR_NA;
 
@@ -528,8 +529,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	devc = sdi->priv;
 	model = devc->model_config;
 
-	/* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
-	 * specific to a probe group must be returned. */
+	/*
+	 * If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
+	 * specific to a probe group must be returned.
+	 */
 	if (!cg) {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
@@ -550,7 +553,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 					g_strv_length((char **)dlm_trigger_slopes));
 			return SR_OK;
 		case SR_CONF_NUM_HDIV:
-			*data = g_variant_new_uint32(ARRAY_SIZE(dlm_timebases));
+			*data = g_variant_new_uint32(model->num_xdivs);
 			return SR_OK;
 		default:
 			return SR_ERR_NA;
@@ -716,5 +719,5 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };