X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstd.c;h=d741c80928a62f0a549d5efbe9305f7a69a33454;hb=1e726f568d6d72a8c6afdcd8fa98b98e910ad523;hp=008e645ca04c8fe43b538c834b31194e1e1db054;hpb=daa39012054a10007986b2463ac61efe4cdd6ac8;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index 008e645c..d741c809 100644
--- a/src/std.c
+++ b/src/std.c
@@ -23,9 +23,11 @@
   * @internal
   */
 
+#include <config.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "std"
 
@@ -56,7 +58,7 @@ SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
 	drvc = g_malloc0(sizeof(struct drv_context));
 	drvc->sr_ctx = sr_ctx;
 	drvc->instances = NULL;
-	di->priv = drvc;
+	di->context = drvc;
 
 	return SR_OK;
 }
@@ -103,6 +105,38 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
+/**
+ * Standard API helper for sending an SR_DF_END packet.
+ *
+ * @param sdi The device instance to use. Must not be NULL.
+ * @param prefix A driver-specific prefix string used for log messages.
+ * 		 Must not be NULL. An empty string is allowed.
+ *
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
+ *         SR_ERR upon other errors.
+ */
+SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi,
+				    const char *prefix)
+{
+	int ret;
+	struct sr_datafeed_packet packet;
+
+	if (!sdi || !prefix)
+		return SR_ERR_ARG;
+
+	sr_dbg("%s: Sending SR_DF_END packet.", prefix);
+
+	packet.type = SR_DF_END;
+	packet.payload = NULL;
+
+	if ((ret = sr_session_send(sdi, &packet)) < 0) {
+		sr_err("%s: Failed to send SR_DF_END packet: %d.", prefix, ret);
+		return ret;
+	}
+
+	return SR_OK;
+}
+
 #ifdef HAVE_LIBSERIALPORT
 
 /**
@@ -177,11 +211,10 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
  * @retval SR_ERR Other errors.
  */
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-			void *cb_data, dev_close_callback dev_close_fn,
+			dev_close_callback dev_close_fn,
 			struct sr_serial_dev_inst *serial, const char *prefix)
 {
 	int ret;
-	struct sr_datafeed_packet packet;
 
 	if (!prefix) {
 		sr_err("Invalid prefix.");
@@ -205,14 +238,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
 		return ret;
 	}
 
-	/* Send SR_DF_END packet to the session bus. */
-	sr_dbg("%s: Sending SR_DF_END packet.", prefix);
-	packet.type = SR_DF_END;
-	packet.payload = NULL;
-	if ((ret = sr_session_send(cb_data, &packet)) < 0) {
-		sr_err("%s: Failed to send SR_DF_END packet: %d.", prefix, ret);
-		return ret;
-	}
+	std_session_send_df_end(sdi, prefix);
 
 	return SR_OK;
 }
@@ -247,7 +273,7 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 	GSList *l;
 	int ret;
 
-	if (!(drvc = driver->priv))
+	if (!(drvc = driver->context))
 		/* Driver was never initialized, nothing to do. */
 		return SR_OK;