if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
/* At slow timebases in live capture the DS2072
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
analog.mqflags = 0;
packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_slist_free(analog.channels);
} else {
logic.length = len;
logic.data = devc->buffer;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
if (devc->num_block_read == devc->num_block_bytes) {
if (!sr_scpi_read_complete(scpi)) {
sr_err("Read should have been completed");
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
devc->num_block_read = 0;
} else {
/* Done with this frame. */
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (++devc->num_frames == devc->limit_frames) {
/* Last frame, stop capture. */
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sdi->driver->dev_acquisition_stop(sdi);
} else {
/* Get the next frame, starting with the first channel. */
devc->channel_entry = devc->enabled_channels;
/* Start of next frame. */
packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
}