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

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index f8833806..45d60db5 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -20,21 +20,15 @@
 #include <config.h>
 #include "protocol.h"
 
-extern struct sr_dev_driver ikalogic_scanalogic2_driver_info;
-
 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;
-
-	devc = sdi->priv;
 
-	/* Remove USB file descriptors from polling. */
 	usb_source_remove(sdi->session, drvc->sr_ctx);
 
-	std_session_send_df_end(devc->cb_data, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	sdi->status = SR_ST_ACTIVE;
 }
@@ -42,14 +36,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;
-
-	devc = sdi->priv;
 
-	/* Remove USB file descriptors from polling. */
 	usb_source_remove(sdi->session, drvc->sr_ctx);
 
-	std_session_send_df_end(devc->cb_data, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	sdi->driver->dev_close(sdi);
 }
@@ -134,7 +124,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);
 			}
 		}
 
@@ -172,10 +162,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;
 			}
@@ -188,7 +178,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);
 	}
 }
 
@@ -635,14 +625,14 @@ SR_PRIV void sl2_calculate_trigger_samples(const struct sr_dev_inst *sdi)
 	devc->post_trigger_bytes = post_trigger_bytes;
 }
 
-SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
-		struct device_info *dev_info)
+SR_PRIV int sl2_get_device_info(struct sr_dev_driver *di,
+		struct sr_usb_dev_inst usb, struct device_info *dev_info)
 {
 	struct drv_context *drvc;
 	uint8_t buffer[PACKET_LENGTH];
 	int ret;
 
-	drvc = ikalogic_scanalogic2_driver_info.context;
+	drvc = di->context;
 
 	if (!dev_info)
 		return SR_ERR_ARG;