]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/lascar-el-usb/api.c
Drop unneeded std_session_send_df_header() comments.
[libsigrok.git] / src / hardware / lascar-el-usb / api.c
index 40a4164943282cd90e076a0b3cf8865b1169a798..40670cec39f23daa292d4345a9411ed466bde971 100644 (file)
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #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);