int ret;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
devc->state = state;
unsigned int old_status;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
old_status = acq->status;
if ((*devc->model->handle_response)(sdi) != SR_OK) {
struct acquisition_state *acq;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
if ((*devc->model->handle_response)(sdi) != SR_OK) {
devc->transfer_error = TRUE;
unsigned int end_addr;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
/* Prepare session packet. */
- packet.type = SR_DF_LOGIC;
+ packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.unitsize = (devc->model->num_channels + 7) / 8;
- logic.data = acq->out_packet;
+ logic.data = acq->out_packet;
end_addr = MIN(acq->mem_addr_next, acq->mem_addr_stop);
acq->in_index = 0;
struct acquisition_state *acq;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
devc->acquisition = NULL;
(void)fd;
- sdi = cb_data;
+ sdi = cb_data;
devc = sdi->priv;
drvc = sdi->driver->context;
return G_SOURCE_REMOVE;
/* Handle pending USB events without blocking. */
- tv.tv_sec = 0;
+ tv.tv_sec = 0;
tv.tv_usec = 0;
ret = libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx,
&tv, NULL);
/* We are done, clean up and send end packet to session bus. */
clear_acquisition_state(sdi);
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
return G_SOURCE_REMOVE;
}
struct dev_context *devc;
struct acquisition_state *acq;
- sdi = transfer->user_data;
+ sdi = transfer->user_data;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
sr_err("Transfer to device failed (state %d): %s.",
struct dev_context *devc;
struct acquisition_state *acq;
- sdi = transfer->user_data;
+ sdi = transfer->user_data;
devc = sdi->priv;
- acq = devc->acquisition;
+ acq = devc->acquisition;
if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
sr_err("Transfer from device failed (state %d): %s.",
struct acquisition_state *acq;
devc = sdi->priv;
- usb = sdi->conn;
+ usb = sdi->conn;
if (devc->acquisition) {
sr_err("Acquisition still in progress?");
ret = submit_request(sdi, STATE_START_CAPTURE);
if (ret == SR_OK)
- ret = std_session_send_df_header(sdi, LOG_PREFIX);
+ ret = std_session_send_df_header(sdi);
if (ret != SR_OK) {
usb_source_remove(sdi->session, drvc->sr_ctx);