#include <string.h>
#include "protocol.h"
-#define BUF_COUNT 8
+#define BUF_COUNT 512
#define BUF_SIZE (16 * 1024)
-#define BUF_TIMEOUT (1000 * 1000)
+#define BUF_TIMEOUT 1000
SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
-static const uint32_t drvopts[] = {
- SR_CONF_LOGIC_ANALYZER,
-};
-
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
+static const uint32_t drvopts[] = {
+ SR_CONF_LOGIC_ANALYZER,
+};
+
static const uint32_t devopts[] = {
SR_CONF_CONTINUOUS,
SR_CONF_CONN | SR_CONF_GET,
if (devc->dig_samplerate == 0)
devc->dig_samplerate = samplerates[3];
- return SR_OK;
+ return saleae_logic_pro_init(sdi);
}
static int dev_close(struct sr_dev_inst *sdi)
static int config_list(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- GVariant *gvar;
- GVariantBuilder gvb;
-
- (void)sdi;
- (void)cg;
-
switch (key) {
case SR_CONF_SCAN_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
- break;
case SR_CONF_DEVICE_OPTIONS:
- if (!sdi) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
- } else {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
- }
- break;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
case SR_CONF_SAMPLERATE:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
- gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
- samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
- g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_samplerates(samplerates, ARRAY_SIZE(samplerates));
break;
default:
return SR_ERR_NA;
struct timeval tv = ALL_ZERO;
(void)fd;
- (void)revents;
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
+ /* Handle timeout */
+ if (!revents)
+ sr_dev_acquisition_stop(sdi);
+
return TRUE;
}
uint8_t *buf;
unsigned int i, ret;
- ret = saleae_logic_pro_init(sdi);
- if (ret != SR_OK)
- return ret;
-
ret = saleae_logic_pro_prepare(sdi);
if (ret != SR_OK)
return ret;
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
- saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
+ saleae_logic_pro_receive_data, (void *)sdi, 0);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));