sysclk-lwla: Declare model_info structs as extern

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

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index e8c2cb0cdf359fc98f5d9ad2246d3f6d3361c9b7..891062560b0d5a09e86d5c24928a38dec6441ce3 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libsigrok/libsigrok.h>
-#include "libsigrok-internal.h"
+#include <libsigrok-internal.h>
 #include "protocol.h"
 
 /* Supported device scan options.
@@ -264,7 +264,7 @@ static int drain_usb(struct sr_usb_dev_inst *usb, unsigned int endpoint)
        do {
                xfer_len = 0;
                ret = libusb_bulk_transfer(usb->devhdl, endpoint,
-                                          buf, sizeof buf, &xfer_len,
+                                          buf, sizeof(buf), &xfer_len,
                                           drain_timeout_ms);
                drained += xfer_len;
        } while (ret == LIBUSB_SUCCESS && xfer_len != 0);
@@ -325,8 +325,10 @@ static int dev_open(struct sr_dev_inst *sdi)
        }
 
        ret = drain_usb(usb, EP_REPLY);
-       if (ret != SR_OK)
+       if (ret != SR_OK) {
+               sr_usb_close(usb);
                return ret;
+       }
 
        sdi->status = SR_ST_ACTIVE;
 
@@ -594,13 +596,14 @@ static int prepare_trigger_masks(const struct sr_dev_inst *sdi)
        uint64_t trigger_mask;
        uint64_t trigger_values;
        uint64_t trigger_edge_mask;
-       uint64_t channel_bit;
+       uint64_t level_bit, type_bit;
        struct dev_context *devc;
        struct sr_trigger *trigger;
        struct sr_trigger_stage *stage;
        struct sr_trigger_match *match;
        const GSList *node;
        int idx;
+       enum sr_trigger_matches trg;
 
        devc = sdi->priv;
 
@@ -625,30 +628,27 @@ static int prepare_trigger_masks(const struct sr_dev_inst *sdi)
                        continue; /* ignore disabled channel */
 
                idx = match->channel->index;
+               trg = match->match;
 
                if (idx < 0 || idx >= devc->model->num_channels) {
                        sr_err("Channel index %d out of range.", idx);
                        return SR_ERR_BUG; /* should not happen */
                }
-               channel_bit = UINT64_C(1) << idx;
-               trigger_mask |= channel_bit;
-
-               switch (match->match) {
-               case SR_TRIGGER_ZERO:
-                       break;
-               case SR_TRIGGER_ONE:
-                       trigger_values |= channel_bit;
-                       break;
-               case SR_TRIGGER_RISING:
-                       trigger_values |= channel_bit;
-                       /* Fall through for edge mask. */
-               case SR_TRIGGER_FALLING:
-                       trigger_edge_mask |= channel_bit;
-                       break;
-               default:
+               if (trg != SR_TRIGGER_ZERO
+                               && trg != SR_TRIGGER_ONE
+                               && trg != SR_TRIGGER_RISING
+                               && trg != SR_TRIGGER_FALLING) {
                        sr_err("Unsupported trigger match for CH%d.", idx + 1);
                        return SR_ERR_ARG;
                }
+               level_bit = (trg == SR_TRIGGER_ONE
+                       || trg == SR_TRIGGER_RISING) ? 1 : 0;
+               type_bit = (trg == SR_TRIGGER_RISING
+                       || trg == SR_TRIGGER_FALLING) ? 1 : 0;
+
+               trigger_mask |= UINT64_C(1) << idx;
+               trigger_values |= level_bit << idx;
+               trigger_edge_mask |= type_bit << idx;
        }
        devc->trigger_mask = trigger_mask;
        devc->trigger_values = trigger_values;