X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic16%2Fprotocol.c;h=a14d0e087c87eb6f180424f9a0e866cda69a4994;hb=6525d819eef098a43b1f438ae4af50e67c9c4335;hp=5566b85972f64d890543e7764e20f5442970af21;hpb=8e2d6c9db788785466d61fdac4d8fdc1535bc20c;p=libsigrok.git

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index 5566b859..a14d0e08 100644
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -757,14 +757,11 @@ SR_PRIV int logic16_init_device(const struct sr_dev_inst *sdi)
 
 static void finish_acquisition(struct sr_dev_inst *sdi)
 {
-	struct sr_datafeed_packet packet;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
 
-	/* Terminate session. */
-	packet.type = SR_DF_END;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	/* Remove fds from polling. */
 	usb_source_remove(sdi->session, devc->ctx);
@@ -936,7 +933,7 @@ SR_PRIV void LIBUSB_CALL logic16_receive_transfer(struct libusb_transfer *transf
 			logic.length = new_samples * 2;
 			logic.unitsize = 2;
 			logic.data = devc->convbuffer;
-			sr_session_send(devc->cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			devc->sent_samples += new_samples;
 		} else {
 			trigger_offset = soft_trigger_logic_check(devc->stl,
@@ -952,7 +949,7 @@ SR_PRIV void LIBUSB_CALL logic16_receive_transfer(struct libusb_transfer *transf
 				logic.length = num_samples * 2;
 				logic.unitsize = 2;
 				logic.data = devc->convbuffer + trigger_offset * 2;
-				sr_session_send(devc->cb_data, &packet);
+				sr_session_send(sdi, &packet);
 				devc->sent_samples += num_samples;
 
 				devc->trigger_fired = TRUE;