X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=f18e2924ab5d7c423fb72b7011a57b23fbb6d1f1;hb=8cb222e1438c984184d9546fc374678aa9341bbb;hp=6db7026115faa0b31164ee9676986fcf8bd60938;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index 6db70261..f18e2924 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -27,16 +27,10 @@ extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
 static void stop_acquisition(struct sr_dev_inst *sdi)
 {
 	struct drv_context *drvc = sdi->driver->context;
-	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
-
-	devc = sdi->priv;
 
-	/* Remove USB file descriptors from polling. */
 	usb_source_remove(sdi->session, drvc->sr_ctx);
 
-	packet.type = SR_DF_END;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	sdi->status = SR_ST_ACTIVE;
 }
@@ -44,16 +38,10 @@ static void stop_acquisition(struct sr_dev_inst *sdi)
 static void abort_acquisition(struct sr_dev_inst *sdi)
 {
 	struct drv_context *drvc = sdi->driver->context;
-	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
-
-	devc = sdi->priv;
 
-	/* Remove USB file descriptors from polling. */
 	usb_source_remove(sdi->session, drvc->sr_ctx);
 
-	packet.type = SR_DF_END;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	sdi->driver->dev_close(sdi);
 }
@@ -138,7 +126,7 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 			if (devc->trigger_type != TRIGGER_TYPE_NONE &&
 					devc->pre_trigger_samples == 0) {
 				packet.type = SR_DF_TRIGGER;
-				sr_session_send(devc->cb_data, &packet);
+				sr_session_send(sdi, &packet);
 			}
 		}
 
@@ -176,10 +164,10 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 				logic.length = n;
 				logic.unitsize = 1;
 				logic.data = buffer;
-				sr_session_send(devc->cb_data, &packet);
+				sr_session_send(sdi, &packet);
 
 				packet.type = SR_DF_TRIGGER;
-				sr_session_send(devc->cb_data, &packet);
+				sr_session_send(sdi, &packet);
 
 				n = 0;
 			}
@@ -192,7 +180,7 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 		logic.length = n;
 		logic.unitsize = 1;
 		logic.data = buffer;
-		sr_session_send(devc->cb_data, &packet);
+		sr_session_send(sdi, &packet);
 	}
 }
 
@@ -270,7 +258,8 @@ SR_PRIV void LIBUSB_CALL sl2_receive_transfer_in( struct libusb_transfer *transf
 	devc = sdi->priv;
 
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
-		sr_err("Transfer to device failed: %i.", transfer->status);
+		sr_err("Transfer to device failed: %s.",
+			libusb_error_name(transfer->status));
 		devc->transfer_error = TRUE;
 		return;
 	}
@@ -400,7 +389,8 @@ SR_PRIV void LIBUSB_CALL sl2_receive_transfer_out( struct libusb_transfer *trans
 	devc = sdi->priv;
 
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
-		sr_err("Transfer to device failed: %i.", transfer->status);
+		sr_err("Transfer to device failed: %s.",
+			libusb_error_name(transfer->status));
 		devc->transfer_error = TRUE;
 		return;
 	}