X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Flascar-el-usb%2Fapi.c;h=40670cec39f23daa292d4345a9411ed466bde971;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=40a4164943282cd90e076a0b3cf8865b1169a798;hpb=41812aca436805b0614f2a8f31cf2f8ce494aea0;p=libsigrok.git diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c index 40a41649..40670cec 100644 --- a/src/hardware/lascar-el-usb/api.c +++ b/src/hardware/lascar-el-usb/api.c @@ -17,9 +17,10 @@ * along with this program. If not, see . */ +#include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "protocol.h" @@ -355,7 +356,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) sr_dbg("Starting log retrieval."); - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000; @@ -368,8 +368,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) if (devc->logged_samples == 0) { /* This ensures the frontend knows the session is done. */ - packet.type = SR_DF_END; - sr_session_send(devc->cb_data, &packet); + std_session_send_df_end(devc->cb_data, LOG_PREFIX); return SR_OK; } @@ -415,7 +414,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv); } if (xfer_in->user_data != GINT_TO_POINTER(1) || - xfer_in->user_data != GINT_TO_POINTER(1)) { + xfer_out->user_data != GINT_TO_POINTER(1)) { sr_dbg("no response to log transfer request"); libusb_free_transfer(xfer_in); libusb_free_transfer(xfer_out);