output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / pipistrello-ols / api.c

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 1d1388bae3bdc174488dc58677132ea5743498e2..8f9829666db820342cd7ab5eb03e8e4e0f58b6a2 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -276,7 +276,6 @@ static int config_set(uint32_t key, GVariant *data,
                break;
        case SR_CONF_PATTERN_MODE:
                stropt = g_variant_get_string(data, NULL);
-               flag = 0xffff;
                if (!strcmp(stropt, STR_PATTERN_NONE)) {
                        sr_info("Disabling test modes.");
                        flag = 0x0000;
@@ -289,10 +288,9 @@ static int config_set(uint32_t key, GVariant *data,
                } else {
                        return SR_ERR;
                }
-               if (flag != 0xffff) {
-                       devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE);
-                       devc->flag_reg |= flag;
-               }
+               devc->flag_reg &= ~FLAG_INTERNAL_TEST_MODE;
+               devc->flag_reg &= ~FLAG_EXTERNAL_TEST_MODE;
+               devc->flag_reg |= flag;
                break;
        case SR_CONF_SWAP:
                if (g_variant_get_boolean(data)) {
@@ -327,7 +325,7 @@ static int config_list(uint32_t key, GVariant **data,
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+               return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
                *data = std_gvar_samplerates_steps(ARRAY_AND_SIZE(samplerates));
                break;
@@ -559,13 +557,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        arg[1] = ((readcount - 1) & 0xff00) >> 8;
        arg[2] = ((readcount - 1) & 0xff0000) >> 16;
        arg[3] = ((readcount - 1) & 0xff000000) >> 24;
-       if (write_longcommand(devc, CMD_CAPTURE_DELAY, arg) != SR_OK)
+       if (write_longcommand(devc, CMD_CAPTURE_READCOUNT, arg) != SR_OK)
                return SR_ERR;
        arg[0] = ((delaycount - 1) & 0xff);
        arg[1] = ((delaycount - 1) & 0xff00) >> 8;
        arg[2] = ((delaycount - 1) & 0xff0000) >> 16;
        arg[3] = ((delaycount - 1) & 0xff000000) >> 24;
-       if (write_longcommand(devc, CMD_CAPTURE_COUNT, arg) != SR_OK)
+       if (write_longcommand(devc, CMD_CAPTURE_DELAYCOUNT, arg) != SR_OK)
                return SR_ERR;
 
        /* Flag register. */
@@ -638,7 +636,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver p_ols_driver_info = {
+static struct sr_dev_driver p_ols_driver_info = {
        .name = "p-ols",
        .longname = "Pipistrello OLS",
        .api_version = 1,