X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=8fa49b66a2b409211f34975eb8645f23d6eaebcf;hb=e434f624ba0c6ebde3c08eca8de241c035283703;hp=2ea124a12926e5ca022d854f6b2c7895649ad7a2;hpb=fd2433153a3e2c2681d637f715c19f2b6f40fcc9;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 2ea124a1..8fa49b66 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -153,7 +153,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
 					ch = l->data;
 					pch = ch->priv;
 					/* Add mqflags from channel_group_spec only to voltage
-					 * and current channels
+					 * and current channels.
 					 */
 					if (pch->mq == SR_MQ_VOLTAGE || pch->mq == SR_MQ_CURRENT)
 						pch->mqflags = cgs->mqflags;
@@ -173,7 +173,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
 	sr_scpi_hw_info_free(hw_info);
 	hw_info = NULL;
 
-	/* Don't send SCPI_CMD_LOCAL for HP 66xxB devices using SCPI over GPIB */
+	/* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */
 	if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
 			scpi->transport == SCPI_TRANSPORT_LIBGPIB))
 		sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
@@ -269,7 +269,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	/* Don't send SCPI_CMD_REMOTE for HP 66xxB devices using SCPI over GPIB */
+	/* Don't send SCPI_CMD_REMOTE for HP 66xxB using SCPI over GPIB. */
 	if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
 			scpi->transport == SCPI_TRANSPORT_LIBGPIB))
 		sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_REMOTE);
@@ -303,7 +303,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 		sr_scpi_cmd(sdi, devc->device->commands,
 			0, NULL, SCPI_CMD_BEEPER_ENABLE);
 
-	/* Don't send SCPI_CMD_LOCAL for HP 66xxB devices using SCPI over GPIB */
+	/* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */
 	if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
 			scpi->transport == SCPI_TRANSPORT_LIBGPIB))
 		sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
@@ -674,6 +674,7 @@ static int config_list(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_channel *ch;
+	struct pps_channel *pch;
 	const struct channel_spec *ch_spec;
 	int i;
 	const char *s[16];
@@ -721,9 +722,10 @@ static int config_list(uint32_t key, GVariant **data,
 		 * specification for use in series or parallel mode.
 		 */
 		ch = cg->channels->data;
+		pch = ch->priv;
 		if (!devc || !devc->device)
 			return SR_ERR_ARG;
-		ch_spec = &(devc->device->channels[ch->index]);
+		ch_spec = &(devc->device->channels[pch->hw_output_idx]);
 
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS: