kingst-la2016: renames to better reflect sequence of activities

[libsigrok.git] / src / hardware / kingst-la2016 / api.c

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 4d501450e9a3fa40a412dbeaea2efb8a592e7d01..7a18742095f2700762540163015d47aad87cbe85 100644 (file)
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -125,7 +125,7 @@ static const char *logic_threshold[] = {
        "USER",
 };
 
-#define MAX_NUM_LOGIC_THRESHOLD_ENTRIES ARRAY_SIZE(logic_threshold)
+#define LOGIC_THRESHOLD_IDX_USER       (ARRAY_SIZE(logic_threshold) - 1)
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
@@ -191,14 +191,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        continue;
 
                /* USB identification matches, a device was found. */
-               sr_dbg("Found a LA2016 device.");
+               sr_dbg("Found a device (USB identification).");
                sdi = g_malloc0(sizeof(struct sr_dev_inst));
                sdi->status = SR_ST_INITIALIZING;
                sdi->connection_id = g_strdup(connection_id);
 
                fw_uploaded = 0;
                dev_addr = libusb_get_device_address(devlist[i]);
-               if (des.iProduct != 2) {
+               if (des.iProduct != LA2016_IPRODUCT_INDEX) {
                        sr_info("Device at '%s' has no firmware loaded.", connection_id);
 
                        if (la2016_upload_firmware(drvc->sr_ctx, devlist[i], des.idProduct) != SR_OK) {
@@ -263,7 +263,9 @@ static int la2016_dev_open(struct sr_dev_inst *sdi)
        for (i = 0; i < device_count; i++) {
                libusb_get_device_descriptor(devlist[i], &des);
 
-               if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID || des.iProduct != 2)
+               if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID)
+                       continue;
+               if (des.iProduct != LA2016_IPRODUCT_INDEX)
                        continue;
 
                if ((sdi->status == SR_ST_INITIALIZING) || (sdi->status == SR_ST_INACTIVE)) {
@@ -410,6 +412,7 @@ static int config_get(uint32_t key, GVariant **data,
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
        double rounded;
+       const char *label;
 
        (void)cg;
 
@@ -445,7 +448,8 @@ static int config_get(uint32_t key, GVariant **data,
                *data = std_gvar_tuple_double(rounded, rounded + 0.1);
                return SR_OK;
        case SR_CONF_LOGIC_THRESHOLD:
-               *data = g_variant_new_string(logic_threshold[devc->threshold_voltage_idx]);
+               label = logic_threshold[devc->threshold_voltage_idx];
+               *data = g_variant_new_string(label);
                break;
        case SR_CONF_LOGIC_THRESHOLD_CUSTOM:
                *data = g_variant_new_double(devc->threshold_voltage);
@@ -482,14 +486,12 @@ static int config_set(uint32_t key, GVariant *data,
        case SR_CONF_VOLTAGE_THRESHOLD:
                g_variant_get(data, "(dd)", &low, &high);
                devc->threshold_voltage = (low + high) / 2.0;
-               devc->threshold_voltage_idx = MAX_NUM_LOGIC_THRESHOLD_ENTRIES - 1; /* USER */
+               devc->threshold_voltage_idx = LOGIC_THRESHOLD_IDX_USER;
                break;
        case SR_CONF_LOGIC_THRESHOLD: {
-               if ((idx = std_str_idx(data, logic_threshold, MAX_NUM_LOGIC_THRESHOLD_ENTRIES)) < 0)
+               if ((idx = std_str_idx(data, ARRAY_AND_SIZE(logic_threshold))) < 0)
                        return SR_ERR_ARG;
-               if (idx == MAX_NUM_LOGIC_THRESHOLD_ENTRIES - 1) {
-                       /* user threshold */
-               } else {
+               if (idx != LOGIC_THRESHOLD_IDX_USER) {
                        devc->threshold_voltage = logic_threshold_value[idx];
                }
                devc->threshold_voltage_idx = idx;
@@ -536,7 +538,7 @@ static int config_list(uint32_t key, GVariant **data,
                *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
                break;
        case SR_CONF_LOGIC_THRESHOLD:
-               *data = g_variant_new_strv(logic_threshold, MAX_NUM_LOGIC_THRESHOLD_ENTRIES);
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(logic_threshold));
                break;
        default:
                return SR_ERR_NA;
@@ -551,14 +553,11 @@ static int configure_channels(const struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
        devc->cur_channels = 0;
-       devc->num_channels = 0;
-
        for (GSList *l = sdi->channels; l; l = l->next) {
                struct sr_channel *ch = (struct sr_channel*)l->data;
                if (ch->enabled == FALSE)
                        continue;
                devc->cur_channels |= 1 << ch->index;
-               devc->num_channels++;
        }
 
        return SR_OK;
@@ -580,7 +579,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       devc->convbuffer_size = 4 * 1024 * 1024;
+       devc->convbuffer_size = LA2016_CONVBUFFER_SIZE;
        if (!(devc->convbuffer = g_try_malloc(devc->convbuffer_size))) {
                sr_err("Cannot allocate conversion buffer.");
                return SR_ERR_MALLOC;
@@ -599,7 +598,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return ret;
        }
 
-       devc->have_trigger = 0;
+       devc->completion_seen = FALSE;
        usb_source_add(sdi->session, drvc->sr_ctx, 50,
                la2016_receive_data, (void *)sdi);