]> sigrok.org Git - libsigrok.git/commitdiff
siglent_sds_channel_start(): Use ternary operator to shorten code.
authorUwe Hermann <redacted>
Wed, 21 Feb 2018 20:36:58 +0000 (21:36 +0100)
committerUwe Hermann <redacted>
Fri, 22 Jun 2018 16:54:28 +0000 (18:54 +0200)
src/hardware/siglent-sds/protocol.c

index 251eb5d04229c2f9ad4c3cd53d21936ab9f1fcd4..e33c4adb32d066742387fa1758f1caed638cca89 100644 (file)
@@ -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;
@@ -227,15 +228,9 @@ SR_PRIV int siglent_sds_channel_start(const struct sr_dev_inst *sdi)
        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;
-               }
+               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);
                break;
        }