Commit bbcffe51 authored by Stefan Brüns's avatar Stefan Brüns Committed by Uwe Hermann

rigol-ds: Fix crash when fetching logic channels

When refactoring the code, some places where sr_scpi_send was replaced
by rigol_ds_config_set the first argument was not changed from sdi->conn
to sdi. Fix the remaining ones.

Fix: https://sigrok.org/bug/1073Signed-off-by: 's avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
parent 8e45ba3f
...@@ -221,7 +221,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi) ...@@ -221,7 +221,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
return SR_OK; return SR_OK;
if (ch->type == SR_CHANNEL_LOGIC) { if (ch->type == SR_CHANNEL_LOGIC) {
if (rigol_ds_config_set(sdi->conn, ":WAV:SOUR LA") != SR_OK) if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK)
return SR_ERR; return SR_ERR;
} else { } else {
if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
...@@ -440,7 +440,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi) ...@@ -440,7 +440,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
break; break;
case PROTOCOL_V3: case PROTOCOL_V3:
if (ch->type == SR_CHANNEL_LOGIC) { if (ch->type == SR_CHANNEL_LOGIC) {
if (rigol_ds_config_set(sdi->conn, ":WAV:SOUR LA") != SR_OK) if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK)
return SR_ERR; return SR_ERR;
} else { } else {
if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment