X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=6403d01a5d5603fb0222788b27a9f18e05138389;hb=090f1e1e5478ea15baa3731fefbd4aff9be78c77;hp=4219042ea7ac75cbcdacd93eadbc99aee67f2d13;hpb=fcd6a8bdf179d7ac0558eef2e205bfb941e5ba5c;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index 4219042e..6403d01a 100644
--- a/src/std.c
+++ b/src/std.c
@@ -25,9 +25,13 @@
  * @internal
  */
 
+/* Needed for gettimeofday(), at least on FreeBSD. */
+#define _XOPEN_SOURCE 700
+
 #include <config.h>
 #include <string.h>
 #include <math.h>
+#include <sys/time.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
@@ -230,6 +234,82 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+/**
+ * Standard API helper for sending an SR_DF_FRAME_BEGIN packet.
+ *
+ * This function can be used to simplify most drivers'
+ * frame handling.
+ *
+ * @param[in] sdi The device instance to use. Must not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval other Other error.
+ */
+SR_PRIV int std_session_send_frame_begin(const struct sr_dev_inst *sdi)
+{
+	const char *prefix;
+	int ret;
+	struct sr_datafeed_packet packet;
+
+	if (!sdi) {
+		sr_err("%s: Invalid argument.", __func__);
+		return SR_ERR_ARG;
+	}
+
+	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
+
+	sr_dbg("%s: Sending SR_DF_FRAME_BEGIN packet.", prefix);
+
+	packet.type = SR_DF_FRAME_BEGIN;
+	packet.payload = NULL;
+
+	if ((ret = sr_session_send(sdi, &packet)) < 0) {
+		sr_err("%s: Failed to send SR_DF_FRAME_BEGIN packet: %d.", prefix, ret);
+		return ret;
+	}
+
+	return SR_OK;
+}
+
+/**
+ * Standard API helper for sending an SR_DF_FRAME_END packet.
+ *
+ * This function can be used to simplify most drivers'
+ * frame handling.
+ *
+ * @param[in] sdi The device instance to use. Must not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ * @retval other Other error.
+ */
+SR_PRIV int std_session_send_frame_end(const struct sr_dev_inst *sdi)
+{
+	const char *prefix;
+	int ret;
+	struct sr_datafeed_packet packet;
+
+	if (!sdi) {
+		sr_err("%s: Invalid argument.", __func__);
+		return SR_ERR_ARG;
+	}
+
+	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
+
+	sr_dbg("%s: Sending SR_DF_FRAME_END packet.", prefix);
+
+	packet.type = SR_DF_FRAME_END;
+	packet.payload = NULL;
+
+	if ((ret = sr_session_send(sdi, &packet)) < 0) {
+		sr_err("%s: Failed to send SR_DF_FRAME_END packet: %d.", prefix, ret);
+		return ret;
+	}
+
+	return SR_OK;
+}
+
 #ifdef HAVE_LIBSERIALPORT
 
 /**
@@ -687,6 +767,23 @@ SR_PRIV GVariant *std_gvar_array_u64(const uint64_t *a, unsigned int n)
 				a, n, sizeof(uint64_t));
 }
 
+SR_PRIV GVariant *std_gvar_array_str(const char *a[], unsigned int n)
+{
+	GVariant *gvar;
+	GVariantBuilder *builder;
+	unsigned int i;
+
+	builder = g_variant_builder_new(G_VARIANT_TYPE ("as"));
+
+	for (i = 0; i < n; i++)
+		g_variant_builder_add(builder, "s", a[i]);
+
+	gvar = g_variant_new("as", builder);
+	g_variant_builder_unref(builder);
+
+	return gvar;
+}
+
 SR_PRIV GVariant *std_gvar_thresholds(const double a[][2], unsigned int n)
 {
 	unsigned int i;