X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=filter.c;h=044737dad8f197b2f7a478b25d4b7cbeaf5e1090;hb=8e77bc20b92574076683d861687b63b416d3e965;hp=4e3115cd10d73deda49973289ca645c58b1e20e2;hpb=7b870c38e3040fec1165a623ae3986e4fb342218;p=libsigrok.git

diff --git a/filter.c b/filter.c
index 4e3115cd..044737da 100644
--- a/filter.c
+++ b/filter.c
@@ -20,9 +20,25 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "filter: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
+/**
+ * @file
+ *
+ * Helper functions to filter out unused probes from samples.
+ */
+
 /**
  * @defgroup grp_filter Probe filter
  *
@@ -80,52 +96,50 @@
  *         If something other than SR_OK is returned, the values of
  *         out_unitsize, data_out, and length_out are undefined.
  */
-SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
-			    const int *probelist, const uint8_t *data_in,
+SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize,
+			    const GArray *probe_array, const uint8_t *data_in,
 			    uint64_t length_in, uint8_t **data_out,
 			    uint64_t *length_out)
 {
 	unsigned int in_offset, out_offset;
-	int num_enabled_probes, out_bit, i;
+	int *probelist, out_bit;
+	unsigned int i;
 	uint64_t sample_in, sample_out;
 
-	if (!probelist) {
-		sr_err("filter: %s: probelist was NULL", __func__);
+	if (!probe_array) {
+		sr_err("%s: probe_array was NULL", __func__);
 		return SR_ERR_ARG;
 	}
+	probelist = (int *)probe_array->data;
 
 	if (!data_in) {
-		sr_err("filter: %s: data_in was NULL", __func__);
+		sr_err("%s: data_in was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!data_out) {
-		sr_err("filter: %s: data_out was NULL", __func__);
+		sr_err("%s: data_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!length_out) {
-		sr_err("filter: %s: length_out was NULL", __func__);
+		sr_err("%s: length_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	num_enabled_probes = 0;
-	for (i = 0; probelist[i] != -1; i++)
-		num_enabled_probes++;
-
 	/* Are there more probes than the target unit size supports? */
-	if (num_enabled_probes > out_unitsize * 8) {
-		sr_err("filter: %s: too many probes (%d) for the target unit "
-		       "size (%d)", __func__, num_enabled_probes, out_unitsize);
+	if (probe_array->len > out_unitsize * 8) {
+		sr_err("%s: too many probes (%d) for the target unit "
+		       "size (%d)", __func__, probe_array->len, out_unitsize);
 		return SR_ERR_ARG;
 	}
 
 	if (!(*data_out = g_try_malloc(length_in))) {
-		sr_err("filter: %s: data_out malloc failed", __func__);
+		sr_err("%s: data_out malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	if (num_enabled_probes == in_unitsize * 8) {
+	if (probe_array->len == in_unitsize * 8) {
 		/* All probes are used -- no need to compress anything. */
 		memcpy(*data_out, data_in, length_in);
 		*length_out = length_in;
@@ -137,7 +151,7 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 	while (in_offset <= length_in - in_unitsize) {
 		memcpy(&sample_in, data_in + in_offset, in_unitsize);
 		sample_out = out_bit = 0;
-		for (i = 0; probelist[i] != -1; i++) {
+		for (i = 0; i < probe_array->len; i++) {
 			if (sample_in & (1 << (probelist[i])))
 				sample_out |= (1 << out_bit);
 			out_bit++;