"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)
{
unsigned int i, j;
const char *conn;
char connection_id[64];
- int64_t fw_updated;
+ uint64_t fw_uploaded;
unsigned int dev_addr;
drvc = di->context;
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_updated = 0;
+ 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) {
g_free(sdi);
continue;
}
- fw_updated = g_get_monotonic_time();
+ fw_uploaded = g_get_monotonic_time();
/* Will re-enumerate. Mark as "unknown address yet". */
dev_addr = 0xff;
}
devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
- devc->fw_updated = fw_updated;
+ devc->fw_uploaded = fw_uploaded;
devc->threshold_voltage_idx = 0;
devc->threshold_voltage = logic_threshold_value[devc->threshold_voltage_idx];
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)) {
static int dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- int64_t timediff_us, timediff_ms;
- uint64_t reset_done;
- uint64_t now;
+ uint64_t reset_done, now, elapsed_ms;
int ret;
devc = sdi->priv;
/*
- * When the sigrok driver recently uploaded firmware, wait for
- * the FX2 to re-enumerate. Deal with the condition that the
- * MCU can take some 2000ms to be gone from the bus before it
- * re-appears executing the recently uploaded firmware.
+ * When the sigrok driver recently has uploaded MCU firmware,
+ * then wait for the FX2 to re-enumerate. Allow the USB device
+ * to vanish before it reappears. Timeouts are rough estimates
+ * after all, the imprecise time of the last check (potentially
+ * executes after the total check period) simplifies code paths
+ * with optional diagnostics. And increases the probability of
+ * successfully detecting "late/slow" devices.
*/
- ret = SR_ERR;
- if (devc->fw_updated > 0) {
+ if (devc->fw_uploaded) {
sr_info("Waiting for device to reset after firmware upload.");
- reset_done = devc->fw_updated;
- reset_done += 1800 * 1000; /* 1.8 seconds */
now = g_get_monotonic_time();
- if (reset_done > now)
+ reset_done = devc->fw_uploaded + RENUM_GONE_DELAY_MS * 1000;
+ if (now < reset_done)
g_usleep(reset_done - now);
- timediff_ms = 0;
- while (timediff_ms < MAX_RENUM_DELAY_MS) {
- g_usleep(200 * 1000);
-
- timediff_us = g_get_monotonic_time() - devc->fw_updated;
- timediff_ms = timediff_us / 1000;
-
- if ((ret = la2016_dev_open(sdi)) == SR_OK)
+ do {
+ now = g_get_monotonic_time();
+ elapsed_ms = (now - devc->fw_uploaded) / 1000;
+ sr_spew("Waited %" PRIu64 "ms.", elapsed_ms);
+ ret = la2016_dev_open(sdi);
+ if (ret == SR_OK) {
+ devc->fw_uploaded = 0;
break;
- sr_spew("Waited %" PRIi64 "ms.", timediff_ms);
- }
+ }
+ g_usleep(RENUM_POLL_INTERVAL_MS * 1000);
+ } while (elapsed_ms < RENUM_CHECK_PERIOD_MS);
if (ret != SR_OK) {
sr_err("Device failed to re-enumerate.");
return SR_ERR;
}
- sr_info("Device came back after %" PRIi64 "ms.", timediff_ms);
+ sr_info("Device came back after %" PRIi64 "ms.", elapsed_ms);
} else {
ret = la2016_dev_open(sdi);
}
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
double rounded;
+ const char *label;
(void)cg;
*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);
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)
+ idx = std_str_idx(data, ARRAY_AND_SIZE(logic_threshold));
+ if (idx < 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;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS:
- return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+ return STD_CONFIG_LIST(key, data, sdi, cg,
+ scanopts, drvopts, devopts);
case SR_CONF_SAMPLERATE:
if (!sdi)
return SR_ERR_ARG;
}
break;
case SR_CONF_LIMIT_SAMPLES:
- *data = std_gvar_tuple_u64(LA2016_NUM_SAMPLES_MIN, LA2016_NUM_SAMPLES_MAX);
+ *data = std_gvar_tuple_u64(LA2016_NUM_SAMPLES_MIN,
+ LA2016_NUM_SAMPLES_MAX);
break;
case SR_CONF_VOLTAGE_THRESHOLD:
*data = std_gvar_min_max_step_thresholds(
*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;
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;
return SR_ERR;
}
- devc->convbuffer_size = 4 * 1024 * 1024;
- if (!(devc->convbuffer = g_try_malloc(devc->convbuffer_size))) {
+ devc->convbuffer_size = LA2016_CONVBUFFER_SIZE;
+ devc->convbuffer = g_try_malloc(devc->convbuffer_size);
+ if (!devc->convbuffer) {
sr_err("Cannot allocate conversion buffer.");
return SR_ERR_MALLOC;
}
- if ((ret = la2016_setup_acquisition(sdi)) != SR_OK) {
+ ret = la2016_setup_acquisition(sdi);
+ if (ret != SR_OK) {
g_free(devc->convbuffer);
devc->convbuffer = NULL;
return ret;
devc->ctx = drvc->sr_ctx;
- if ((ret = la2016_start_acquisition(sdi)) != SR_OK) {
+ ret = la2016_start_acquisition(sdi);
+ if (ret != SR_OK) {
la2016_abort_acquisition(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);
projects / libsigrok.git / blobdiff