X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fapi.c;h=ff045f16425e61ad091be85868c2111845cb39fe;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=33800c7345867024b467d7fbe9a7e2453720af19;hpb=8de2dc3b2e6ee1cb2df31db567e59f197623007c;p=libsigrok.git

diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c
index 33800c73..ff045f16 100644
--- a/hardware/hameg-hmo/api.c
+++ b/hardware/hameg-hmo/api.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdlib.h>
-#include <glib/gstdio.h>
 #include "protocol.h"
 
 #define SERIALCOMM "115200/8n1/flow=1"
@@ -35,21 +34,11 @@ static const int32_t hwopts[] = {
 	SR_CONF_SERIALCOMM,
 };
 
-struct usb_id_info {
-	uint16_t vendor_id;
-	uint16_t product_id;
-};
-
-static struct usb_id_info ho_models[] = {
-	{ 0x0403, 0xed72 }, /* HO720 */
-	{ 0x0403, 0xed73 }, /* HO730 */
-};
-
 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)
@@ -57,142 +46,6 @@ static int init(struct sr_context *sr_ctx)
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-/**
- * Find USB serial devices via the USB vendor ID and product ID.
- *
- * @param vendor_id Vendor ID of the USB device.
- * @param product_id Product ID of the USB device.
- *
- * @return A GSList of strings containing the path of the serial device or
- *         NULL if no serial device is found. The returned list must be freed
- *         by the caller.
- */
-static GSList *auto_find_usb(uint16_t vendor_id, uint16_t product_id)
-{
-#ifdef __linux__
-	const gchar *usb_dev;
-	const char device_tree[] = "/sys/bus/usb/devices/";
-	GDir *devices_dir, *device_dir;
-	GSList *l = NULL;
-	GSList *tty_devs;
-	GSList *matched_paths;
-	FILE *fd;
-	char tmp[5];
-	gchar *vendor_path, *product_path, *path_copy;
-	gchar *prefix, *subdir_path, *device_path, *tty_path;
-	unsigned long read_vendor_id, read_product_id;
-	const char *file;
-
-	l = NULL;
-	tty_devs = NULL;
-	matched_paths = NULL;
-
-	if (!(devices_dir = g_dir_open(device_tree, 0, NULL)))
-		return NULL;
-
-	/*
-	 * Find potential candidates using the vendor ID and product ID
-	 * and store them in matched_paths.
-	 */
-	while ((usb_dev = g_dir_read_name(devices_dir))) {
-		vendor_path = g_strconcat(device_tree,
-					  usb_dev, "/idVendor", NULL);
-		product_path = g_strconcat(device_tree,
-					   usb_dev, "/idProduct", NULL);
-
-		if (!g_file_test(vendor_path, G_FILE_TEST_EXISTS) ||
-		    !g_file_test(product_path, G_FILE_TEST_EXISTS))
-			goto skip_device;
-
-		if ((fd = g_fopen(vendor_path, "r")) == NULL)
-			goto skip_device;
-
-		if (fgets(tmp, sizeof(tmp), fd) == NULL) {
-			fclose(fd);
-			goto skip_device;
-		}
-		read_vendor_id = strtoul(tmp, NULL, 16);
-
-		fclose(fd);
-
-		if ((fd = g_fopen(product_path, "r")) == NULL)
-			goto skip_device;
-
-		if (fgets(tmp, sizeof(tmp), fd) == NULL) {
-			fclose(fd);
-			goto skip_device;
-		}
-		read_product_id = strtoul(tmp, NULL, 16);
-
-		fclose(fd);
-
-		if (vendor_id == read_vendor_id &&
-		    product_id == read_product_id) {
-			path_copy = g_strdup(usb_dev);
-			matched_paths = g_slist_prepend(matched_paths,
-							path_copy);
-		}
-
-skip_device:
-		g_free(vendor_path);
-		g_free(product_path);
-	}
-	g_dir_close(devices_dir);
-
-	/* For every matched device try to find a ttyUSBX subfolder. */
-	for (l = matched_paths; l; l = l->next) {
-		subdir_path = NULL;
-
-		device_path = g_strconcat(device_tree, l->data, NULL);
-
-		if (!(device_dir = g_dir_open(device_path, 0, NULL))) {
-			g_free(device_path);
-			continue;
-		}
-
-		prefix = g_strconcat(l->data, ":", NULL);
-
-		while ((file = g_dir_read_name(device_dir))) {
-			if (g_str_has_prefix(file, prefix)) {
-				subdir_path = g_strconcat(device_path,
-						"/", file, NULL);
-				break;
-			}
-		}
-		g_dir_close(device_dir);
-
-		g_free(prefix);
-		g_free(device_path);
-
-		if (subdir_path) {
-			if (!(device_dir = g_dir_open(subdir_path, 0, NULL))) {
-				g_free(subdir_path);
-				continue;
-			}
-			g_free(subdir_path);
-
-			while ((file = g_dir_read_name(device_dir))) {
-				if (g_str_has_prefix(file, "ttyUSB")) {
-					tty_path = g_strconcat("/dev/",
-							       file, NULL);
-					sr_dbg("Found USB device %04x:%04x attached to %s.",
-					       vendor_id, product_id, tty_path);
-					tty_devs = g_slist_prepend(tty_devs,
-							tty_path);
-					break;
-				}
-			}
-			g_dir_close(device_dir);
-		}
-	}
-	g_slist_free_full(matched_paths, g_free);
-
-	return tty_devs;
-#else
-	return NULL;
-#endif
-}
-
 static int check_manufacturer(const char *manufacturer)
 {
 	unsigned int i;
@@ -204,26 +57,16 @@ static int check_manufacturer(const char *manufacturer)
 	return SR_ERR;
 }
 
-static struct sr_dev_inst *hmo_probe_serial_device(const char *serial_device,
-						    const char *serial_options)
+static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct sr_scpi_hw_info *hw_info;
-	struct sr_scpi_dev_inst *scpi;
 
 	sdi = NULL;
 	devc = NULL;
-	scpi = NULL;
 	hw_info = NULL;
 
-	if (!(scpi = scpi_dev_inst_new(serial_device, serial_options)))
-		goto fail;
-
-	sr_info("Probing %s.", serial_device);
-	if (sr_scpi_open(scpi) != SR_OK)
-		goto fail;
-
 	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
 		sr_info("Couldn't get IDN response.");
 		goto fail;
@@ -260,8 +103,6 @@ static struct sr_dev_inst *hmo_probe_serial_device(const char *serial_device,
 fail:
 	if (hw_info)
 		sr_scpi_hw_info_free(hw_info);
-	if (scpi)
-		sr_scpi_free(scpi);
 	if (sdi)
 		sr_dev_inst_free(sdi);
 	if (devc)
@@ -272,49 +113,7 @@ fail:
 
 static GSList *scan(GSList *options)
 {
-	GSList *devices;
-	struct drv_context *drvc;
-	struct sr_dev_inst *sdi;
-	const char *serial_device, *serial_options;
-	GSList *l, *tty_devs;
-	unsigned int i;
-
-	serial_device = NULL;
-	serial_options = SERIALCOMM;
-	sdi = NULL;
-	devices = NULL;
-	drvc = di->priv;
-	drvc->instances = NULL;
-
-	if (sr_serial_extract_options(options, &serial_device,
-				      &serial_options) == SR_OK) {
-		sdi = hmo_probe_serial_device(serial_device, serial_options);
-		if (sdi != NULL) {
-			devices = g_slist_append(devices, sdi);
-			drvc->instances = g_slist_append(drvc->instances, sdi);
-		}
-	} else {
-		tty_devs = NULL;
-
-		for (i = 0; i < ARRAY_SIZE(ho_models); i++) {
-			if ((l = auto_find_usb(ho_models[i].vendor_id,
-					   ho_models[i].product_id)) == NULL)
-				continue;
-			tty_devs = g_slist_concat(tty_devs, l);
-		}
-
-		for (l = tty_devs; l; l = l->next) {
-			sdi = hmo_probe_serial_device(l->data, serial_options);
-			if (sdi != NULL) {
-				devices = g_slist_append(devices, sdi);
-				drvc->instances = g_slist_append(drvc->instances, sdi);
-			}
-		}
-
-		g_slist_free_full(tty_devs, g_free);
-	}
-
-	return devices;
+	return sr_scpi_scan(di->priv, options, hmo_probe_serial_device);
 }
 
 static GSList *dev_list(void)
@@ -334,10 +133,10 @@ static void clear_helper(void *priv)
 	hmo_scope_state_free(devc->model_state);
 
 	for (i = 0; i < model->analog_channels; ++i)
-		g_slist_free(devc->analog_groups[i].probes);
+		g_slist_free(devc->analog_groups[i].channels);
 
 	for (i = 0; i < model->digital_pods; ++i) {
-		g_slist_free(devc->digital_groups[i].probes);
+		g_slist_free(devc->digital_groups[i].channels);
 		g_free(devc->digital_groups[i].name);
 	}
 
@@ -384,59 +183,66 @@ static int cleanup(void)
 	return SR_OK;
 }
 
-static int check_probe_group(struct dev_context *devc,
-			     const struct sr_probe_group *probe_group)
+static int check_channel_group(struct dev_context *devc,
+			     const struct sr_channel_group *cg)
 {
 	unsigned int i;
 	struct scope_config *model;
 
 	model = devc->model_config;
 
-	if (!probe_group)
-		return PG_NONE;
+	if (!cg)
+		return CG_NONE;
 
 	for (i = 0; i < model->analog_channels; ++i)
-		if (probe_group == &devc->analog_groups[i])
-			return PG_ANALOG;
+		if (cg == &devc->analog_groups[i])
+			return CG_ANALOG;
 
 	for (i = 0; i < model->digital_pods; ++i)
-		if (probe_group == &devc->digital_groups[i])
-			return PG_DIGITAL;
+		if (cg == &devc->digital_groups[i])
+			return CG_DIGITAL;
 
-	sr_err("Invalid probe group specified.");
+	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_probe_group *probe_group)
+		      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;
+	struct scope_state *state;
 
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+	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;
 
 	switch (key) {
 	case SR_CONF_NUM_TIMEBASE:
 		*data = g_variant_new_int32(model->num_xdivs);
 		ret = SR_OK;
 		break;
+	case SR_CONF_TIMEBASE:
+		*data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0],
+				      (*model->timebases)[state->timebase][1]);
+		ret = SR_OK;
+		break;
 	case SR_CONF_NUM_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_int32(model->num_ydivs);
 				ret = SR_OK;
@@ -447,6 +253,58 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			ret = SR_ERR_NA;
 		}
 		break;
+	case SR_CONF_VDIV:
+		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 (cg != &devc->analog_groups[i])
+					continue;
+				*data = g_variant_new("(tt)",
+						      (*model->vdivs)[state->analog_channels[i].vdiv][0],
+						      (*model->vdivs)[state->analog_channels[i].vdiv][1]);
+				ret = SR_OK;
+				break;
+			}
+
+		} else {
+			ret = SR_ERR_NA;
+		}
+		break;
+	case SR_CONF_TRIGGER_SOURCE:
+		*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
+		ret = SR_OK;
+		break;
+	case SR_CONF_TRIGGER_SLOPE:
+		*data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
+		ret = SR_OK;
+		break;
+	case SR_CONF_HORIZ_TRIGGERPOS:
+		*data = g_variant_new_double(state->horiz_triggerpos);
+		ret = SR_OK;
+		break;
+	case SR_CONF_COUPLING:
+		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 (cg != &devc->analog_groups[i])
+					continue;
+				*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
+				ret = SR_OK;
+				break;
+			}
+
+		} else {
+			ret = SR_ERR_NA;
+		}
+		break;
+	case SR_CONF_SAMPLERATE:
+		*data = g_variant_new_uint64(state->sample_rate);
+		ret = SR_OK;
+		break;
 	default:
 		ret = SR_ERR_NA;
 	}
@@ -474,26 +332,28 @@ 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_probe_group *probe_group)
+		      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;
 	struct scope_config *model;
 	struct scope_state *state;
 	const char *tmp;
-	uint64_t p, q, tmp_u64;
+	uint64_t p, q;
 	double tmp_d;
+	gboolean update_sample_rate;
 
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	model = devc->model_config;
 	state = devc->model_state;
+	update_sample_rate = FALSE;
 
 	ret = SR_ERR_NA;
 
@@ -517,9 +377,9 @@ static int config_set(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;
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
 		}
 
 		g_variant_get(data, "(tt)", &p, &q);
@@ -529,7 +389,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			    q != (*model->vdivs)[i][1])
 				continue;
 			for (j = 1; j <= model->analog_channels; ++j) {
-				if (probe_group != &devc->analog_groups[j - 1])
+				if (cg != &devc->analog_groups[j - 1])
 					continue;
 				state->analog_channels[j - 1].vdiv = i;
 				g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
@@ -562,6 +422,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 				   float_str);
 
 			ret = sr_scpi_send(sdi->conn, command);
+			update_sample_rate = TRUE;
 			break;
 		}
 		break;
@@ -571,31 +432,37 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		if (tmp_d < 0.0 || tmp_d > 1.0)
 			return SR_ERR;
 
-		state->horiz_triggerpos = -(tmp_d - 0.5) * state->timebase * model->num_xdivs;
+		state->horiz_triggerpos = tmp_d;
+		tmp_d = -(tmp_d - 0.5) *
+			((double) (*model->timebases)[state->timebase][0] /
+			(*model->timebases)[state->timebase][1])
+			 * model->num_xdivs;
+
+		g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d);
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS],
-			   state->horiz_triggerpos);
+			   float_str);
 
 		ret = sr_scpi_send(sdi->conn, command);
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
-		tmp_u64 = g_variant_get_uint64(data);
+		tmp = g_variant_get_string(data, NULL);
 
-		if (tmp_u64 != 0 && tmp_u64 != 1)
-			return SR_ERR;
+		if (!tmp || !(tmp[0] == 'f' || tmp[0] == 'r'))
+			return SR_ERR_ARG;
 
-		state->trigger_slope = tmp_u64;
+		state->trigger_slope = (tmp[0] == 'r') ? 0 : 1;
 
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE],
-			   tmp_u64 ? "POS" : "NEG");
+			   (state->trigger_slope == 0) ? "POS" : "NEG");
 
 		ret = sr_scpi_send(sdi->conn, command);
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE) {
-			sr_err("No probe group specified.");
-			return SR_ERR_PROBE_GROUP;
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
 		}
 
 		tmp = g_variant_get_string(data, NULL);
@@ -604,7 +471,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
 				continue;
 			for (j = 1; j <= model->analog_channels; ++j) {
-				if (probe_group != &devc->analog_groups[j - 1])
+				if (cg != &devc->analog_groups[j - 1])
 					continue;
 				state->analog_channels[j-1].coupling = i;
 
@@ -630,31 +497,34 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	if (ret == SR_OK)
 		ret = sr_scpi_get_opc(sdi->conn);
 
+	if (ret == SR_OK && update_sample_rate)
+		ret = hmo_update_sample_rate(sdi);
+
 	return ret;
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		       const struct sr_probe_group *probe_group)
+		       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_probe_group(devc, probe_group)) == 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));
@@ -664,8 +534,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		}
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE)
-			return SR_ERR_PROBE_GROUP;
+		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));
 		break;
@@ -673,12 +543,16 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_new_strv(*model->trigger_sources,
 			   g_strv_length((char **)*model->trigger_sources));
 		break;
+	case SR_CONF_TRIGGER_SLOPE:
+		*data = g_variant_new_strv(*model->trigger_slopes,
+			   g_strv_length((char **)*model->trigger_slopes));
+		break;
 	case SR_CONF_TIMEBASE:
 		*data = build_tuples(model->timebases, model->num_timebases);
 		break;
 	case SR_CONF_VDIV:
-		if (pg_type == PG_NONE)
-			return SR_ERR_PROBE_GROUP;
+		if (cg_type == CG_NONE)
+			return SR_ERR_CHANNEL_GROUP;
 		*data = build_tuples(model->vdivs, model->num_vdivs);
 		break;
 	default:
@@ -691,53 +565,53 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
 {
 	char command[MAX_COMMAND_SIZE];
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct scope_config *model;
 
 	devc = sdi->priv;
 	model = devc->model_config;
 
-	probe = devc->current_probe->data;
+	ch = devc->current_channel->data;
 
-	switch (probe->type) {
-	case SR_PROBE_ANALOG:
+	switch (ch->type) {
+	case SR_CHANNEL_ANALOG:
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_GET_ANALOG_DATA],
-			   probe->index + 1);
+			   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],
-			   probe->index < 8 ? 1 : 2);
+			   ch->index < 8 ? 1 : 2);
 		break;
 	default:
-		sr_err("Invalid probe type.");
+		sr_err("Invalid channel type.");
 		break;
 	}
 
 	return sr_scpi_send(sdi->conn, command);
 }
 
-static int hmo_check_probes(GSList *probes)
+static int hmo_check_channels(GSList *channels)
 {
 	GSList *l;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4;
 
 	enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE;
 
-	for (l = probes; l; l = l->next) {
-		probe = l->data;
-		switch (probe->type) {
-		case SR_PROBE_ANALOG:
-			if (probe->index == 2)
+	for (l = channels; l; l = l->next) {
+		ch = l->data;
+		switch (ch->type) {
+		case SR_CHANNEL_ANALOG:
+			if (ch->index == 2)
 				enabled_chan3 = TRUE;
-			else if (probe->index == 3)
+			else if (ch->index == 3)
 				enabled_chan4 = TRUE;
 			break;
-		case SR_PROBE_LOGIC:
-			if (probe->index < 8)
+		case SR_CHANNEL_LOGIC:
+			if (ch->index < 8)
 				enabled_pod1 = TRUE;
 			else
 				enabled_pod2 = TRUE;
@@ -754,15 +628,15 @@ static int hmo_check_probes(GSList *probes)
 	return SR_OK;
 }
 
-static int hmo_setup_probes(const struct sr_dev_inst *sdi)
+static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 {
 	GSList *l;
 	unsigned int i;
-	gboolean *pod_enabled;
+	gboolean *pod_enabled, setup_changed;
 	char command[MAX_COMMAND_SIZE];
 	struct scope_state *state;
 	struct scope_config *model;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;
 
@@ -770,41 +644,44 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
 	scpi = sdi->conn;
 	state = devc->model_state;
 	model = devc->model_config;
+	setup_changed = FALSE;
 
 	pod_enabled = g_try_malloc0(sizeof(gboolean) * model->digital_pods);
 
-	for (l = sdi->probes; l; l = l->next) {
-		probe = l->data;
-		switch (probe->type) {
-		case SR_PROBE_ANALOG:
-			if (probe->enabled == state->analog_channels[probe->index].state)
+	for (l = sdi->channels; l; l = l->next) {
+		ch = l->data;
+		switch (ch->type) {
+		case SR_CHANNEL_ANALOG:
+			if (ch->enabled == state->analog_channels[ch->index].state)
 				break;
 			g_snprintf(command, sizeof(command),
 				   (*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE],
-				   probe->index + 1, probe->enabled);
+				   ch->index + 1, ch->enabled);
 
 			if (sr_scpi_send(scpi, command) != SR_OK)
 				return SR_ERR;
-			state->analog_channels[probe->index].state = probe->enabled;
+			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 probes.
+			 * 8 channels.
 			 */
-			if (probe->enabled)
-				pod_enabled[probe->index < 8 ? 0 : 1] = TRUE;
+			if (ch->enabled)
+				pod_enabled[ch->index < 8 ? 0 : 1] = TRUE;
 
-			if (probe->enabled == state->digital_channels[probe->index])
+			if (ch->enabled == state->digital_channels[ch->index])
 				break;
 			g_snprintf(command, sizeof(command),
 				   (*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
-				   probe->index, probe->enabled);
+				   ch->index, ch->enabled);
 
 			if (sr_scpi_send(scpi, command) != SR_OK)
 				return SR_ERR;
 
-			state->digital_channels[probe->index] = probe->enabled;
+			state->digital_channels[ch->index] = ch->enabled;
+			setup_changed = TRUE;
 			break;
 		default:
 			return SR_ERR;
@@ -820,10 +697,14 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
 		if (sr_scpi_send(scpi, command) != SR_OK)
 			return SR_ERR;
 		state->digital_pods[i - 1] = pod_enabled[i - 1];
+		setup_changed = TRUE;
 	}
 
 	g_free(pod_enabled);
 
+	if (setup_changed && hmo_update_sample_rate(sdi) != SR_OK)
+		return SR_ERR;
+
 	return SR_OK;
 }
 
@@ -831,7 +712,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	GSList *l;
 	gboolean digital_added;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;
 
@@ -842,38 +723,39 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	devc = sdi->priv;
 	digital_added = FALSE;
 
-	for (l = sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (!probe->enabled)
+	for (l = sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (!ch->enabled)
 			continue;
-		/* Only add a single digital probe. */
-		if (probe->type != SR_PROBE_LOGIC || !digital_added) {
-			devc->enabled_probes = g_slist_append(
-					devc->enabled_probes, probe);
-			if (probe->type == SR_PROBE_LOGIC)
+		/* Only add a single digital channel. */
+		if (ch->type != SR_CHANNEL_LOGIC || !digital_added) {
+			devc->enabled_channels = g_slist_append(
+					devc->enabled_channels, ch);
+			if (ch->type == SR_CHANNEL_LOGIC)
 				digital_added = TRUE;
 		}
 	}
 
-	if (!devc->enabled_probes)
+	if (!devc->enabled_channels)
 		return SR_ERR;
 
-	if (hmo_check_probes(devc->enabled_probes) != SR_OK) {
-		sr_err("Invalid probe configuration specified!");
+	if (hmo_check_channels(devc->enabled_channels) != SR_OK) {
+		sr_err("Invalid channel configuration specified!");
 		return SR_ERR_NA;
 	}
 
-	if (hmo_setup_probes(sdi) != SR_OK) {
-		sr_err("Failed to setup probe configuration!");
+	if (hmo_setup_channels(sdi) != SR_OK) {
+		sr_err("Failed to setup channel configuration!");
 		return SR_ERR;
 	}
 
-	sr_scpi_source_add(scpi, G_IO_IN, 50, hmo_receive_data, (void *)sdi);
+	sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
+			hmo_receive_data, (void *)sdi);
 
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
-	devc->current_probe = devc->enabled_probes;
+	devc->current_channel = devc->enabled_channels;
 
 	return hmo_request_data(sdi);
 }
@@ -895,10 +777,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 	devc = sdi->priv;
 
-	g_slist_free(devc->enabled_probes);
-	devc->enabled_probes = NULL;
+	devc->num_frames = 0;
+	g_slist_free(devc->enabled_channels);
+	devc->enabled_channels = NULL;
 	scpi = sdi->conn;
-	sr_scpi_source_remove(scpi);
+	sr_scpi_source_remove(sdi->session, scpi);
 
 	return SR_OK;
 }