X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=a7c3f96376044b5b7b3e48eb3152b5ef53ad5f3a;hb=2cb232a9e42345c3783f4898c5a5049871edc534;hp=7f274258ddafe8b1245ff887fc663d55394db9db;hpb=3be42bc22f8b36599a448273c12a76d3e0f7a940;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 7f274258..a7c3f963 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.c
+++ b/src/hardware/openbench-logic-sniffer/protocol.c
@@ -20,8 +20,6 @@
 #include <config.h>
 #include "protocol.h"
 
-extern SR_PRIV struct sr_dev_driver ols_driver_info;
-
 SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
 		uint8_t command)
 {
@@ -149,7 +147,6 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->status = SR_ST_INACTIVE;
-	sdi->driver = &ols_driver_info;
 	devc = ols_dev_new();
 	sdi->priv = devc;
 
@@ -320,7 +317,7 @@ SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi)
 	serial = sdi->conn;
 	serial_source_remove(sdi->session, serial);
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 }
 
 SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
@@ -472,12 +469,12 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 				logic.unitsize = 4;
 				logic.data = devc->raw_sample_buf +
 					(devc->limit_samples - devc->num_samples) * 4;
-				sr_session_send(cb_data, &packet);
+				sr_session_send(sdi, &packet);
 			}
 
 			/* Send the trigger. */
 			packet.type = SR_DF_TRIGGER;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 
 			/* Send post-trigger samples. */
 			packet.type = SR_DF_LOGIC;
@@ -486,7 +483,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 			logic.unitsize = 4;
 			logic.data = devc->raw_sample_buf + devc->trigger_at * 4 +
 				(devc->limit_samples - devc->num_samples) * 4;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 		} else {
 			/* no trigger was used */
 			packet.type = SR_DF_LOGIC;
@@ -495,7 +492,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 			logic.unitsize = 4;
 			logic.data = devc->raw_sample_buf +
 				(devc->limit_samples - devc->num_samples) * 4;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 		}
 		g_free(devc->raw_sample_buf);