X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fprotocol.c;h=8d4f9056d6a51a6ea29a738abac2ba19bcbbd2b8;hp=1a0b7bce39820a12dffd19a5f60fa1d31f38d951;hb=6525d819eef098a43b1f438ae4af50e67c9c4335;hpb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1 diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c index 1a0b7bce..8d4f9056 100644 --- a/src/hardware/link-mso19/protocol.c +++ b/src/hardware/link-mso19/protocol.c @@ -19,6 +19,7 @@ * along with this program. If not, see . */ +#include #include "protocol.h" /* serial protocol */ @@ -285,15 +286,12 @@ SR_PRIV int mso_toggle_led(struct sr_dev_inst *sdi, int state) SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi) { - struct sr_datafeed_packet packet; struct dev_context *devc; devc = sdi->priv; serial_source_remove(sdi->session, devc->serial); - /* Terminate session */ - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi, LOG_PREFIX); } SR_PRIV int mso_clkrate_out(struct sr_serial_dev_inst *serial, uint16_t val) @@ -418,13 +416,13 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data) logic.length = 1024; logic.unitsize = 1; logic.data = logic_out; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); devc->num_samples += 1024; if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { sr_info("Requested number of samples reached."); - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sdi->driver->dev_acquisition_stop(sdi); } return TRUE;