X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=b1a85b03a621110d64a16c4397d2f01f1524be7f;hb=bf700f679af2ad95c1272df47579b21212241718;hp=45d60db507855837b000e36bf64acc4988e88ea5;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index 45d60db5..b1a85b03 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -41,7 +41,7 @@ static void abort_acquisition(struct sr_dev_inst *sdi)
 
 	std_session_send_df_end(sdi);
 
-	sdi->driver->dev_close(sdi);
+	sr_dev_close(sdi);
 }
 
 static void buffer_sample_data(const struct sr_dev_inst *sdi)
@@ -531,25 +531,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 +621,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);