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

[libsigrok.git] / src / hardware / lecroy-logicstudio / api.c

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index dfa13284273c8fcf6205b10327d797a11eace342..6425e0f5fcedaeb95cdbbcedb545b165dcf952fd 100644 (file)
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -35,8 +35,13 @@
 #define UNKNOWN_ADDRESS 0xff
 #define MAX_RENUM_DELAY_MS 3000
 
-static const uint32_t devopts[] = {
+#define NUM_CHANNELS 16
+
+static const uint32_t drvopts[] = {
        SR_CONF_LOGIC_ANALYZER,
+};
+
+static const uint32_t devopts[] = {
        SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
@@ -86,7 +91,7 @@ static struct sr_dev_inst *create_device(struct sr_usb_dev_inst *usb,
        sdi->inst_type = SR_INST_USB;
        sdi->conn = usb;
 
-       for (i = 0; i < 16; i++) {
+       for (i = 0; i < NUM_CHANNELS; i++) {
                snprintf(channel_name, sizeof(channel_name), "D%i", i);
                sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
        }
@@ -129,7 +134,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                if (des.idVendor != LOGICSTUDIO16_VID)
                        continue;
 
-               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+               if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+                       continue;
 
                usb = NULL;
 
@@ -191,9 +197,6 @@ static int open_device(struct sr_dev_inst *sdi)
        size_t i;
        int r;
 
-       if (sdi->status == SR_ST_ACTIVE)
-               return SR_ERR;
-
        drvc = sdi->driver->context;
        usb = sdi->conn;
 
@@ -208,7 +211,8 @@ static int open_device(struct sr_dev_inst *sdi)
                        des.idProduct != LOGICSTUDIO16_PID_HAVE_FIRMWARE)
                        continue;
 
-               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+               if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+                       continue;
 
                /*
                 * Check if this device is the same one that we associated
@@ -340,15 +344,13 @@ static int dev_close(struct sr_dev_inst *sdi)
        }
 
        if (!usb->devhdl)
-               return SR_ERR;
+               return SR_ERR_BUG;
 
        libusb_release_interface(usb->devhdl, 0);
 
        libusb_close(usb->devhdl);
        usb->devhdl = NULL;
 
-       sdi->status = SR_ST_INACTIVE;
-
        return SR_OK;
 }
 
@@ -395,8 +397,6 @@ static int config_set(uint32_t key, GVariant *data,
                return lls_set_samplerate(sdi, g_variant_get_uint64(data));
        case SR_CONF_CAPTURE_RATIO:
                devc->capture_ratio = g_variant_get_uint64(data);
-               if (devc->capture_ratio > 100)
-                       return SR_ERR;
                break;
        default:
                return SR_ERR_NA;
@@ -408,30 +408,14 @@ static int config_set(uint32_t key, GVariant *data,
 static int config_list(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       GVariantBuilder vb;
-       GVariant *var;
-
-       (void)sdi;
-       (void)cg;
-
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts, ARRAY_SIZE(devopts),
-                               sizeof(uint32_t));
-               break;
+               return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
-               g_variant_builder_init(&vb, G_VARIANT_TYPE("a{sv}"));
-               var = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
-                               samplerates, ARRAY_SIZE(samplerates),
-                               sizeof(uint64_t));
-               g_variant_builder_add(&vb, "{sv}", "samplerates", var);
-               *data = g_variant_builder_end(&vb);
+               *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
                break;
        case SR_CONF_TRIGGER_MATCH:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               trigger_matches, ARRAY_SIZE(trigger_matches),
-                               sizeof(int32_t));
+               *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
                break;
        default:
                return SR_ERR_NA;
@@ -493,6 +477,7 @@ static struct sr_dev_driver lecroy_logicstudio_driver_info = {
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
+       .dev_clear = std_dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,