};
static const char *channel_names[] = {
- "0", "1", "2", "3", "4", "5", "6", "7", "8",
- "9", "10", "11", "12", "13", "14", "15",
+ "0", "1", "2", "3", "4", "5", "6", "7",
+ "8", "9", "10", "11", "12", "13", "14", "15",
};
static const uint64_t samplerates[] = {
usb = NULL;
for (l = conn_devices; l; l = l->next) {
usb = l->data;
- if (usb->bus == libusb_get_bus_number(devlist[i])
- && usb->address == libusb_get_device_address(devlist[i]))
+ if (usb->bus == libusb_get_bus_number(devlist[i]) &&
+ usb->address == libusb_get_device_address(devlist[i]))
break;
}
- if (!l)
+ if (!l) {
/* This device matched none of the ones that
* matched the conn specification. */
continue;
+ }
}
libusb_get_device_descriptor(devlist[i], &des);
timediff_us = g_get_monotonic_time() - devc->fw_updated;
timediff_ms = timediff_us / 1000;
-
+
if ((ret = la2016_dev_open(sdi)) == SR_OK)
break;
sr_spew("Waited %" PRIi64 "ms.", timediff_ms);
return SR_ERR;
}
sr_info("Device came back after %" PRIi64 "ms.", timediff_ms);
- } else
+ } else {
ret = la2016_dev_open(sdi);
+ }
if (ret != SR_OK) {
sr_err("Unable to open device.");
return SR_OK;
}
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
if (!sdi->conn)
return SR_ERR_ARG;
usb = sdi->conn;
- if (usb->address == 255)
+ if (usb->address == 255) {
/* Device still needs to re-enumerate after firmware
* upload, so we don't know its (future) address. */
return SR_ERR;
+ }
*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
break;
case SR_CONF_SAMPLERATE:
case SR_CONF_LOGIC_THRESHOLD_CUSTOM:
*data = g_variant_new_double(devc->threshold_voltage);
break;
-
+
default:
return SR_ERR_NA;
}
return SR_OK;
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
double low, high;
return SR_OK;
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
switch (key) {
case SR_CONF_SCAN_OPTIONS:
return SR_OK;
}
-static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsigned int num_tfers)
+static void send_chunk(struct sr_dev_inst *sdi,
+ const uint8_t *packets, unsigned int num_tfers)
{
struct dev_context *devc;
struct sr_datafeed_logic logic;
struct sr_datafeed_packet sr_packet;
- transfer_packet_t *packet;
- acq_packet_t *p;
- unsigned int max_samples, n_samples, total_samples, free_n_samples, ptotal;
+ unsigned int max_samples, n_samples, total_samples, free_n_samples;
unsigned int i, j, k;
int do_signal_trigger;
uint16_t *wp;
+ const uint8_t *rp;
+ uint16_t state;
+ uint8_t repetitions;
devc = sdi->priv;
max_samples = devc->convbuffer_size / 2;
n_samples = 0;
- wp = (uint16_t*)devc->convbuffer;
+ wp = (uint16_t *)devc->convbuffer;
total_samples = 0;
do_signal_trigger = 0;
devc->reading_behind_trigger = 1;
}
+ rp = packets;
for (i = 0; i < num_tfers; i++) {
- transfer_packet_host(packets[i]);
- packet = packets + i;
- ptotal = 0;
- for (k = 0; k < ARRAY_SIZE(packet->packet); k++) {
+ for (k = 0; k < NUM_PACKETS_IN_CHUNK; k++) {
free_n_samples = max_samples - n_samples;
if (free_n_samples < 256 || do_signal_trigger) {
logic.length = n_samples * 2;
sr_session_send(sdi, &sr_packet);
n_samples = 0;
- wp = (uint16_t*)devc->convbuffer;
+ wp = (uint16_t *)devc->convbuffer;
if (do_signal_trigger) {
std_session_send_df_trigger(sdi);
do_signal_trigger = 0;
}
}
- p = packet->packet + k;
- for (j = 0; j < p->repetitions; j++)
- *(wp++) = p->state;
- n_samples += p->repetitions;
- total_samples += p->repetitions;
- ptotal += p->repetitions;
- devc->total_samples += p->repetitions;
+
+ state = read_u16le_inc(&rp);
+ repetitions = read_u8_inc(&rp);
+ for (j = 0; j < repetitions; j++)
+ *wp++ = state;
+
+ n_samples += repetitions;
+ total_samples += repetitions;
+ devc->total_samples += repetitions;
if (!devc->reading_behind_trigger) {
- devc->n_reps_until_trigger --;
+ devc->n_reps_until_trigger--;
if (devc->n_reps_until_trigger == 0) {
devc->reading_behind_trigger = 1;
do_signal_trigger = 1;
}
}
}
+ (void)read_u8_inc(&rp); /* Skip sequence number. */
}
if (n_samples) {
logic.length = n_samples * 2;
sr_err("bulk transfer timeout!");
devc->transfer_finished = 1;
}
- send_chunk(sdi, (transfer_packet_t*)transfer->buffer, transfer->actual_length / sizeof(transfer_packet_t));
+ send_chunk(sdi, transfer->buffer, transfer->actual_length / TRANSFER_PACKET_LENGTH);
devc->n_bytes_to_read -= transfer->actual_length;
if (devc->n_bytes_to_read) {
libusb_fill_bulk_transfer(
transfer, usb->devhdl,
0x86, transfer->buffer, to_read,
- receive_transfer, (void*)sdi, DEFAULT_TIMEOUT_MS);
+ receive_transfer, (void *)sdi, DEFAULT_TIMEOUT_MS);
if ((ret = libusb_submit_transfer(transfer)) == 0)
return;
g_free(devc->convbuffer);
devc->convbuffer = NULL;
+ devc->transfer = NULL;
+
sr_dbg("transfer is now finished");
}
struct sr_channel *ch = (struct sr_channel*)l->data;
if (ch->enabled == FALSE)
continue;
- devc->cur_channels |= 1 << (ch->index);
+ devc->cur_channels |= 1 << ch->index;
devc->num_channels++;
}
}
devc->have_trigger = 0;
- usb_source_add(sdi->session, drvc->sr_ctx, 50, handle_event, (void*)sdi);
+ usb_source_add(sdi->session, drvc->sr_ctx, 50, handle_event, (void *)sdi);
std_session_send_df_header(sdi);
projects / libsigrok.git / blobdiff