#include <string.h>
#include "protocol.h"
-#define BUF_COUNT (8)
-#define BUF_SIZE (16*1024)
-#define BUF_TIMEOUT (1000*1000)
+#define BUF_COUNT 8
+#define BUF_SIZE (16 * 1024)
+#define BUF_TIMEOUT (1000 * 1000)
SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
return SR_ERR;
}
- /* configure default samplerate */
+ /* Configure default samplerate. */
if (devc->dig_samplerate == 0)
devc->dig_samplerate = samplerates[3];
- sdi->status = SR_ST_ACTIVE;
-
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
- struct sr_usb_dev_inst *usb = sdi->conn;
-
- sr_usb_close(usb);
-
- sdi->status = SR_ST_INACTIVE;
+ sr_usb_close(sdi->conn);
return SR_OK;
}
(void)cg;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
ret = SR_OK;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts,
- ARRAY_SIZE(scanopts),
- sizeof(uint32_t));
+ 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));
+ 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));
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
}
break;
case SR_CONF_SAMPLERATE:
{
struct sr_dev_inst *sdi = cb_data;
struct drv_context *drvc = sdi->driver->context;
- struct timeval tv = {};
+ struct timeval tv = ALL_ZERO;
(void)fd;
(void)revents;
uint8_t *buf;
unsigned int i, ret;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
ret = saleae_logic_pro_init(sdi);
if (ret != SR_OK)
return ret;
buf = g_malloc(BUF_SIZE);
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);
+ 2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
+ saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));
struct dev_context *devc = sdi->priv;
struct drv_context *drvc = sdi->driver->context;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
saleae_logic_pro_stop(sdi);
std_session_send_df_end(sdi);