SR_TRIGGER_EDGE,
};
-SR_PRIV struct sr_dev_driver ipdbg_la_driver_info;
-
static void ipdbg_la_split_addr_port(const char *conn, char **addr,
char **port)
{
ipdbg_la_get_addrwidth_and_datawidth(tcp, devc);
- sr_dbg("addr_width = %d, data_width = %d\n", devc->ADDR_WIDTH,
- devc->DATA_WIDTH);
+ sr_dbg("addr_width = %d, data_width = %d\n", devc->addr_width,
+ devc->data_width);
sr_dbg("limit samples = %" PRIu64 "\n", devc->limit_samples_max);
- for (uint32_t i = 0; i < devc->DATA_WIDTH; i++) {
- const uint8_t buf_size = 16;
- char buf[buf_size];
- snprintf(buf, buf_size, "ch%d", i);
- sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, buf);
+ for (uint32_t i = 0; i < devc->data_width; i++) {
+ char *name = g_strdup_printf("CH%d", i);
+ sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
+ g_free(name);
}
sdi->inst_type = SR_INST_USER;
devc->capture_ratio = g_variant_get_uint64(data);
break;
case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = g_variant_get_uint64(data);
+ {
+ uint64_t limit_samples = g_variant_get_uint64(data);
+ if (limit_samples <= devc->limit_samples_max)
+ devc->limit_samples = limit_samples;
+ }
break;
default:
return SR_ERR_NA;
struct ipdbg_la_tcp *tcp = sdi->conn;
struct dev_context *devc = sdi->priv;
- uint8_t byte;
+ const size_t bufsize = 1024;
+ uint8_t buffer[bufsize];
if (devc->num_transfers > 0) {
while (devc->num_transfers <
- (devc->limit_samples_max * devc->DATA_WIDTH_BYTES)) {
- ipdbg_la_tcp_receive(tcp, &byte);
- devc->num_transfers++;
+ (devc->limit_samples_max * devc->data_width_bytes)) {
+ int recd = ipdbg_la_tcp_receive(tcp, buffer, bufsize);
+ if (recd > 0)
+ devc->num_transfers += recd;
}
}
return SR_OK;
}
-SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = {
+static struct sr_dev_driver ipdbg_la_driver_info = {
.name = "ipdbg-la",
.longname = "IPDBG LA",
.api_version = 1,
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
-
SR_REGISTER_DEV_DRIVER(ipdbg_la_driver_info);