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

diff --git a/src/std.c b/src/std.c
index 4219042e..9199611a 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"
@@ -178,7 +182,6 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
 	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
 	/* Send header packet to the session bus. */
-	sr_dbg("%s: Sending SR_DF_HEADER packet.", prefix);
 	packet.type = SR_DF_HEADER;
 	packet.payload = (uint8_t *)&header;
 	header.feed_version = 1;
@@ -217,8 +220,6 @@ SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 
 	prefix = (sdi->driver) ? sdi->driver->name : "unknown";
 
-	sr_dbg("%s: Sending SR_DF_END packet.", prefix);
-
 	packet.type = SR_DF_END;
 	packet.payload = NULL;
 
@@ -230,6 +231,78 @@ 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";
+
+	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";
+
+	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
 
 /**
@@ -632,15 +705,21 @@ SR_PRIV GVariant *std_gvar_min_max_step_array(const double a[3])
 
 SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double min, const double max, const double step)
 {
-	double d;
+	double d, v;
 	GVariant *gvar, *range[2];
 	GVariantBuilder gvb;
 
 	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
 
 	for (d = min; d <= max; d += step) {
-		range[0] = g_variant_new_double(d);
-		range[1] = g_variant_new_double(d);
+		/*
+		 * We will never see exactly 0.0 because of the error we're
+		 * accumulating, so catch the "zero" value and force it to be 0.
+		 */
+		v = ((d > (-step / 2)) && (d < (step / 2))) ? 0 : d;
+
+		range[0] = g_variant_new_double(v);
+		range[1] = g_variant_new_double(v);
 
 		gvar = g_variant_new_tuple(range, 2);
 		g_variant_builder_add_value(&gvb, gvar);
@@ -669,24 +748,41 @@ SR_PRIV GVariant *std_gvar_tuple_double(double low, double high)
 	return g_variant_new_tuple(range, 2);
 }
 
-SR_PRIV GVariant *std_gvar_array_i32(const int32_t *a, unsigned int n)
+SR_PRIV GVariant *std_gvar_array_i32(const int32_t a[], unsigned int n)
 {
 	return g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				a, n, sizeof(int32_t));
 }
 
-SR_PRIV GVariant *std_gvar_array_u32(const uint32_t *a, unsigned int n)
+SR_PRIV GVariant *std_gvar_array_u32(const uint32_t a[], unsigned int n)
 {
 	return g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				a, n, sizeof(uint32_t));
 }
 
-SR_PRIV GVariant *std_gvar_array_u64(const uint64_t *a, unsigned int n)
+SR_PRIV GVariant *std_gvar_array_u64(const uint64_t a[], unsigned int n)
 {
 	return g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
 				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;