From: Aurelien Jacobs <redacted>
Date: Sat, 25 Jun 2016 19:37:53 +0000 (+0200)
Subject: rigol-ds: properly report which channel is enabled.
X-Git-Tag: libsigrok-0.5.0~299
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=e264ebded832bc6556f88f771e9598d998aac6ce

rigol-ds: properly report which channel is enabled.
---

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index d9d8dc7e..98570ff0 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -769,6 +769,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
+	struct sr_channel *ch;
 	char *cmd;
 	unsigned int i;
 	int res;
@@ -782,6 +783,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 		g_free(cmd);
 		if (res != SR_OK)
 			return SR_ERR;
+		ch = g_slist_nth_data(sdi->channels, i);
+		ch->enabled = devc->analog_channels[i];
 	}
 	sr_dbg("Current analog channel state:");
 	for (i = 0; i < devc->model->analog_channels; i++)
@@ -804,6 +807,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 			g_free(cmd);
 			if (res != SR_OK)
 				return SR_ERR;
+			ch = g_slist_nth_data(sdi->channels, i + devc->model->analog_channels);
+			ch->enabled = devc->digital_channels[i];
 			sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
 		}
 	}