scpi-pps: Add a missing "break" in config_get().

[libsigrok.git] / src / hardware / beaglelogic / api.c

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 5a7068c4407020297543d0c56726a2941f7bbac1..0be82c13ca9d2c8302a7756a125f876260437b41 100644 (file)
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -65,11 +65,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        struct sr_config *src;
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
-       const char *conn = NULL;
+       const char *conn;
        gchar **params;
        int i, maxch;
 
        maxch = NUM_CHANNELS;
+       conn = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
                if (src->key == SR_CONF_NUM_LOGIC_CHANNELS)
@@ -80,6 +81,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        /* Probe for /dev/beaglelogic if not connecting via TCP */
        if (!conn) {
+               params = NULL;
                if (!g_file_test(BEAGLELOGIC_DEV_NODE, G_FILE_TEST_EXISTS))
                        return NULL;
        } else {
@@ -107,7 +109,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        /* Default non-zero values (if any) */
        devc->fd = -1;
-       devc->limit_samples = (uint64_t)10000000;
+       devc->limit_samples = 10000000;
        devc->tcp_buffer = 0;
 
        if (!conn) {
@@ -328,7 +330,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
        /* If continuous sampling, set the limit_samples to max possible value */
        if (devc->triggerflags == BL_TRIGGERFLAGS_CONTINUOUS)
-               devc->limit_samples = (uint64_t)-1;
+               devc->limit_samples = UINT64_MAX;
 
        /* Configure triggers & send header packet */
        if ((trigger = sr_session_trigger_get(sdi->session))) {