switch (transfer->status) {
case LIBUSB_TRANSFER_NO_DEVICE:
/* USB device was unplugged. */
- hw_dev_acquisition_stop(sdi, sdi);
+ dev_acquisition_stop(sdi, sdi);
return;
case LIBUSB_TRANSFER_COMPLETED:
case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
devc->rcvd_bytes, devc->log_size,
devc->rcvd_samples, devc->logged_samples);
if (devc->rcvd_bytes >= devc->log_size)
- hw_dev_acquisition_stop(sdi, sdi);
+ dev_acquisition_stop(sdi, sdi);
}
if (sdi->status == SR_ST_ACTIVE) {
libusb_error_name(ret));
g_free(transfer->buffer);
libusb_free_transfer(transfer);
- hw_dev_acquisition_stop(sdi, sdi);
+ dev_acquisition_stop(sdi, sdi);
}
} else {
/* This was the last transfer we're going to receive, so
SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int dummy, flags, ret;
devc = sdi->priv;
- if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK)
+ usb = sdi->conn;
+
+ if (lascar_get_config(usb->devhdl, devc->config, &dummy) != SR_OK)
return -1;
flags = get_flags(devc->config);
SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int len, flags, ret;
devc = sdi->priv;
- if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK)
+ usb = sdi->conn;
+
+ if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
return SR_ERR;
/* Turn on logging. */
/* Start logging in 0 seconds. */
memset(devc->config + 24, 0, 4);
- ret = lascar_save_config(devc->usb->devhdl, devc->config, len);
+ ret = lascar_save_config(usb->devhdl, devc->config, len);
sr_info("Started internal logging.");
return ret;
SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int len, flags, ret;
devc = sdi->priv;
- if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK)
+ usb = sdi->conn;
+
+ if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
return SR_ERR;
flags = get_flags(devc->config);
flags &= ~0x0100;
set_flags(devc->config, flags);
- ret = lascar_save_config(devc->usb->devhdl, devc->config, len);
+ ret = lascar_save_config(usb->devhdl, devc->config, len);
sr_info("Stopped internal logging.");
return ret;