X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=f4ceb67ab4b26b2f1ea569c7682c357cddb9b219;hb=7f0463840ab5d6a85daaa76850558d2b71e596cf;hp=c58050bbb102e316c3d580108793405f81415f8c;hpb=093e1cba6b7bf14cfb77fa36f59b0c16e6fca7cc;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index c58050bb..f4ceb67a 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -122,10 +122,8 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 			 * through the capture ratio.
 			 */
 			if (devc->trigger_type != TRIGGER_TYPE_NONE &&
-					devc->pre_trigger_samples == 0) {
-				packet.type = SR_DF_TRIGGER;
-				sr_session_send(sdi, &packet);
-			}
+					devc->pre_trigger_samples == 0)
+				std_session_send_df_trigger(sdi);
 		}
 
 		for (; k >= 0; k--) {
@@ -164,8 +162,7 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 				logic.data = buffer;
 				sr_session_send(sdi, &packet);
 
-				packet.type = SR_DF_TRIGGER;
-				sr_session_send(sdi, &packet);
+				std_session_send_df_trigger(sdi);
 
 				n = 0;
 			}
@@ -531,25 +528,6 @@ SR_PRIV int sl2_convert_trigger(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV int sl2_set_capture_ratio(const struct sr_dev_inst *sdi,
-				  uint64_t capture_ratio)
-{
-	struct dev_context *devc;
-
-	devc = sdi->priv;
-
-	if (capture_ratio > 100) {
-		sr_err("Invalid capture ratio: %" PRIu64 " %%.", capture_ratio);
-		return SR_ERR_ARG;
-	}
-
-	sr_info("Capture ratio set to %" PRIu64 " %%.", capture_ratio);
-
-	devc->capture_ratio = capture_ratio;
-
-	return SR_OK;
-}
-
 SR_PRIV int sl2_set_after_trigger_delay(const struct sr_dev_inst *sdi,
 					uint64_t after_trigger_delay)
 {
@@ -640,10 +618,6 @@ SR_PRIV int sl2_get_device_info(struct sr_dev_driver *di,
 	if (sr_usb_open(drvc->sr_ctx->libusb_ctx, &usb) != SR_OK)
 		return SR_ERR;
 
-	/*
-	 * Determine if a kernel driver is active on this interface and, if so,
-	 * detach it.
-	 */
 	if (libusb_kernel_driver_active(usb.devhdl, USB_INTERFACE) == 1) {
 		ret = libusb_detach_kernel_driver(usb.devhdl,
 			USB_INTERFACE);