Fix a few "value never read" scan-build warnings.

[libsigrok.git] / src / hardware / sysclk-lwla / protocol.c

diff --git a/src/hardware/sysclk-lwla/protocol.c b/src/hardware/sysclk-lwla/protocol.c
index ccabdddf4ca8d60faf3484a60ecf8a5e6f28515b..1c9bca885e08f3af60949aa8f807d1003331015b 100644 (file)
--- a/src/hardware/sysclk-lwla/protocol.c
+++ b/src/hardware/sysclk-lwla/protocol.c
@@ -110,10 +110,10 @@ static int capture_setup(const struct sr_dev_inst *sdi)
                switch (devc->cfg_trigger_slope) {
                case EDGE_POSITIVE:
                        trigger_mask |= (uint64_t)1 << 35;
-                       break; 
+                       break;
                case EDGE_NEGATIVE:
                        trigger_mask |= (uint64_t)1 << 34;
-                       break; 
+                       break;
                }
 
        command[19] = LWLA_WORD_0(trigger_mask);
@@ -132,8 +132,8 @@ static int capture_setup(const struct sr_dev_inst *sdi)
        command[25] = LWLA_WORD_2(memory_limit);
        command[26] = LWLA_WORD_3(memory_limit);
 
-       /* Fill remaining 64-bit words with zeroes. */
-       memset(&command[27], 0, 16 * sizeof(uint16_t));
+       /* Fill remaining words with zeroes. */
+       memset(&command[27], 0, sizeof(command) - 27 * sizeof(command[0]));
 
        return lwla_send_command(sdi->conn, command, ARRAY_SIZE(command));
 }
@@ -305,7 +305,7 @@ static void process_capture_length(const struct sr_dev_inst *sdi)
 
        sr_dbg("%zu words in capture buffer.", acq->mem_addr_fill);
 
-       if (acq->mem_addr_fill > 0 && sdi->status == SR_ST_ACTIVE)
+       if (acq->mem_addr_fill > 0 && !devc->cancel_requested)
                issue_read_start(sdi);
        else
                issue_read_end(sdi);
@@ -599,8 +599,7 @@ static void end_acquisition(struct sr_dev_inst *sdi)
 
        lwla_free_acquisition_state(devc->acquisition);
        devc->acquisition = NULL;
-
-       sdi->status = SR_ST_ACTIVE;
+       devc->cancel_requested = FALSE;
 }
 
 /* USB output transfer completion callback.
@@ -631,7 +630,7 @@ static void LIBUSB_CALL receive_transfer_out(struct libusb_transfer *transfer)
                        submit_transfer(devc, devc->acquisition->xfer_in);
                        break;
                case STATE_STOP_CAPTURE:
-                       if (sdi->status == SR_ST_ACTIVE)
+                       if (!devc->cancel_requested)
                                request_capture_length(sdi);
                        else
                                end_acquisition(sdi);
@@ -743,55 +742,6 @@ SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
        return ret;
 }
 
-SR_PRIV int lwla_convert_trigger(const struct sr_dev_inst *sdi)
-{
-       struct dev_context *devc;
-       struct sr_trigger *trigger;
-       struct sr_trigger_stage *stage;
-       struct sr_trigger_match *match;
-       const GSList *l, *m;
-       uint64_t channel_index;
-
-       devc = sdi->priv;
-
-       devc->trigger_mask = 0;
-       devc->trigger_values = 0;
-       devc->trigger_edge_mask = 0;
-
-       if (!(trigger = sr_session_trigger_get(sdi->session)))
-               return SR_OK;
-
-       if (g_slist_length(trigger->stages) > 1) {
-               sr_err("This device only supports 1 trigger stage.");
-               return SR_ERR;
-       }
-
-       for (l = trigger->stages; l; l = l->next) {
-               stage = l->data;
-               for (m = stage->matches; m; m = m->next) {
-                       match = m->data;
-                       if (!match->channel->enabled)
-                               /* Ignore disabled channels with a trigger. */
-                               continue;
-                       channel_index = (uint64_t)1 << match->channel->index;
-                       devc->trigger_mask |= channel_index;
-                       switch (match->match) {
-                       case SR_TRIGGER_ONE:
-                               devc->trigger_values |= channel_index;
-                               break;
-                       case SR_TRIGGER_RISING:
-                               devc->trigger_values |= channel_index;
-                               /* Fall through for edge mask. */
-                       case SR_TRIGGER_FALLING:
-                               devc->trigger_edge_mask |= channel_index;
-                               break;
-                       }
-               }
-       }
-
-       return SR_OK;
-}
-
 /* Select the LWLA clock configuration.  If the clock source changed from
  * the previous setting, this will download a new bitstream to the FPGA.
  */
@@ -1021,7 +971,7 @@ SR_PRIV int lwla_receive_data(int fd, int revents, void *cb_data)
 
        /* If no event flags are set the timeout must have expired. */
        if (revents == 0 && devc->state == STATE_STATUS_WAIT) {
-               if (sdi->status == SR_ST_STOPPING)
+               if (devc->cancel_requested)
                        issue_stop_capture(sdi);
                else
                        request_capture_status(sdi);