X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsiglent-sds%2Fprotocol.c;h=8a2547df80338d2520ef09626354e928a6190a73;hb=c26107b745715d8890b79d2537910cd5e50ee4ed;hp=251eb5d04229c2f9ad4c3cd53d21936ab9f1fcd4;hpb=e5b41b8d7e60cac101fe4a1657da2f54597ff6a1;p=libsigrok.git diff --git a/src/hardware/siglent-sds/protocol.c b/src/hardware/siglent-sds/protocol.c index 251eb5d0..8a2547df 100644 --- a/src/hardware/siglent-sds/protocol.c +++ b/src/hardware/siglent-sds/protocol.c @@ -216,6 +216,7 @@ SR_PRIV int siglent_sds_channel_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_channel *ch; + const char *s; if (!(devc = sdi->priv)) return SR_ERR; @@ -224,21 +225,10 @@ SR_PRIV int siglent_sds_channel_start(const struct sr_dev_inst *sdi) sr_dbg("Starting reading data from channel %d.", ch->index + 1); - switch (devc->model->series->protocol) { - case NON_SPO_MODEL: - case SPO_MODEL: - if (ch->type == SR_CHANNEL_LOGIC) { - if (sr_scpi_send(sdi->conn, "D%d:WF?", - ch->index + 1) != SR_OK) - return SR_ERR; - } else { - if (sr_scpi_send(sdi->conn, "C%d:WF? ALL", - ch->index + 1) != SR_OK) - return SR_ERR; - } - siglent_sds_set_wait_event(devc, WAIT_NONE); - break; - } + s = (ch->type == SR_CHANNEL_LOGIC) ? "D%d:WF?" : "C%d:WF? ALL"; + if (sr_scpi_send(sdi->conn, s, ch->index + 1) != SR_OK) + return SR_ERR; + siglent_sds_set_wait_event(devc, WAIT_NONE); siglent_sds_set_wait_event(devc, WAIT_BLOCK);