sr: moved sigrok.h so libsigrok/libsigrok.h

[libsigrok.git] / filter.c

diff --git a/filter.c b/filter.c
index 2da2755b0e063d4d87320d6b18e50b7f6abcc6f0..0775765f276fbbdf5b6dedda9ec9c0f1771f196b 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <sigrok.h>
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /**
  * Remove unused probes from samples.
@@ -73,9 +73,10 @@
  *         If something other than SR_OK is returned, the values of
  *         out_unitsize, data_out, and length_out are undefined.
  */
-int sr_filter_probes(int in_unitsize, int out_unitsize, const int *probelist,
-                    const unsigned char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
+                           const int *probelist, 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;
@@ -101,11 +102,6 @@ int sr_filter_probes(int in_unitsize, int out_unitsize, const int *probelist,
                return SR_ERR_ARG;
        }
 
-       if (!length_out) {
-               sr_err("filter: %s: length_out was NULL", __func__);
-               return SR_ERR_ARG;
-       }
-
        num_enabled_probes = 0;
        for (i = 0; probelist[i]; i++)
                num_enabled_probes++;