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

[libsigrok.git] / src / hardware / asix-sigma / api.c

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index f56bdd45bc2c4589a2bf560d5baa2c01653c5035..f1b96bb79fdd16eb489792989e7dbc486323efdc 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -35,6 +35,7 @@ static const char *channel_names[] = {
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
+       SR_CONF_PROBE_NAMES,
 };
 
 static const uint32_t drvopts[] = {
@@ -51,6 +52,7 @@ static const uint32_t devopts[] = {
        SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
        SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
+       /* Consider SR_CONF_TRIGGER_PATTERN (SR_T_STRING, GET/SET) support. */
 };
 
 static const char *ext_clock_edges[] = {
@@ -108,6 +110,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        struct drv_context *drvc;
        libusb_context *usbctx;
        const char *conn;
+       const char *probe_names;
        GSList *l, *conn_devices;
        struct sr_config *src;
        GSList *devices;
@@ -119,24 +122,29 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        char conn_id[20];
        char serno_txt[16];
        char *end;
-       long serno_num, serno_pre;
+       unsigned long serno_num, serno_pre;
        enum asix_device_type dev_type;
        const char *dev_text;
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        size_t devidx, chidx;
+       size_t count;
 
        drvc = di->context;
        usbctx = drvc->sr_ctx->libusb_ctx;
 
        /* Find all devices which match an (optional) conn= spec. */
        conn = NULL;
+       probe_names = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
                case SR_CONF_CONN:
                        conn = g_variant_get_string(src->data, NULL);
                        break;
+               case SR_CONF_PROBE_NAMES:
+                       probe_names = g_variant_get_string(src->data, NULL);
+                       break;
                }
        }
        conn_devices = NULL;
@@ -191,7 +199,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                 * All ASIX logic analyzers have a serial number, which
                 * reads as a hex number, and tells the device type.
                 */
-               ret = sr_atol_base(serno_txt, &serno_num, &end, 16);
+               ret = sr_atoul_base(serno_txt, &serno_num, &end, 16);
                if (ret != SR_OK || !end || *end) {
                        sr_warn("Cannot interpret serial number %s.", serno_txt);
                        continue;
@@ -233,12 +241,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sdi->model = g_strdup(dev_text);
                sdi->serial_num = g_strdup(serno_txt);
                sdi->connection_id = g_strdup(conn_id);
-               for (chidx = 0; chidx < ARRAY_SIZE(channel_names); chidx++)
-                       sr_channel_new(sdi, chidx, SR_CHANNEL_LOGIC,
-                               TRUE, channel_names[chidx]);
-
                devc = g_malloc0(sizeof(*devc));
                sdi->priv = devc;
+               devc->channel_names = sr_parse_probe_names(probe_names,
+                       channel_names, ARRAY_SIZE(channel_names),
+                       ARRAY_SIZE(channel_names), &count);
+               for (chidx = 0; chidx < count; chidx++)
+                       sr_channel_new(sdi, chidx, SR_CHANNEL_LOGIC,
+                               TRUE, devc->channel_names[chidx]);
                devc->id.vid = des.idVendor;
                devc->id.pid = des.idProduct;
                devc->id.serno = serno_num;
@@ -303,7 +313,7 @@ static int config_get(uint32_t key, GVariant **data,
                *data = g_variant_new_boolean(devc->clock.use_ext_clock);
                break;
        case SR_CONF_EXTERNAL_CLOCK_SOURCE:
-               clock_text = channel_names[devc->clock.clock_pin];
+               clock_text = devc->channel_names[devc->clock.clock_pin];
                *data = g_variant_new_string(clock_text);
                break;
        case SR_CONF_CLOCK_EDGE:
@@ -329,6 +339,8 @@ static int config_set(uint32_t key, GVariant *data,
        struct dev_context *devc;
        int ret;
        uint64_t want_rate, have_rate;
+       const char **names;
+       size_t count;
        int idx;
 
        (void)cg;
@@ -356,7 +368,9 @@ static int config_set(uint32_t key, GVariant *data,
                devc->clock.use_ext_clock = g_variant_get_boolean(data);
                break;
        case SR_CONF_EXTERNAL_CLOCK_SOURCE:
-               idx = std_str_idx(data, ARRAY_AND_SIZE(channel_names));
+               names = (const char **)devc->channel_names;
+               count = g_strv_length(devc->channel_names);
+               idx = std_str_idx(data, names, count);
                if (idx < 0)
                        return SR_ERR_ARG;
                devc->clock.clock_pin = idx;
@@ -383,6 +397,11 @@ 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)
 {
+       struct dev_context *devc;
+       const char **names;
+       size_t count;
+
+       devc = sdi ? sdi->priv : NULL;
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
        case SR_CONF_DEVICE_OPTIONS:
@@ -394,7 +413,11 @@ static int config_list(uint32_t key, GVariant **data,
                *data = sigma_get_samplerates_list();
                break;
        case SR_CONF_EXTERNAL_CLOCK_SOURCE:
-               *data = g_variant_new_strv(ARRAY_AND_SIZE(channel_names));
+               if (!devc)
+                       return SR_ERR_ARG;
+               names = (const char **)devc->channel_names;
+               count = g_strv_length(devc->channel_names);
+               *data = g_variant_new_strv(names, count);
                break;
        case SR_CONF_CLOCK_EDGE:
                *data = g_variant_new_strv(ARRAY_AND_SIZE(ext_clock_edges));