X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=filter.c;h=11610157a45497f18a1d00becae00b90c9a04453;hb=409d85b3ac23c2915413c97354533f1d05f7dd9e;hp=044737dad8f197b2f7a478b25d4b7cbeaf5e1090;hpb=305de92e9d50bcabaa055d43dc27fec1c2e97cc1;p=libsigrok.git diff --git a/filter.c b/filter.c index 044737da..11610157 100644 --- a/filter.c +++ b/filter.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010-2012 Bert Vermeulen * @@ -24,14 +24,14 @@ #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) +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "filter: " +#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) +#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) +#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) +#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) +#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) +#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) /** * @file @@ -80,8 +80,8 @@ * The requested unit size must be big enough to hold as * much data as is specified by the number of enabled * probes in 'probelist'. - * @param probelist Pointer to a list of probe numbers, numbered starting - * from 0. The list is terminated with -1. + * @param probe_array Pointer to a list of probe numbers, numbered starting + * from 0. The list is terminated with -1. * @param data_in Pointer to the input data buffer. Must not be NULL. * @param length_in The input data length (>= 1), in number of bytes. * @param data_out Variable which will point to the newly allocated buffer @@ -95,6 +95,8 @@ * or SR_ERR_ARG upon invalid arguments. * If something other than SR_OK is returned, the values of * out_unitsize, data_out, and length_out are undefined. + * + * @since 0.2.0 */ SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize, const GArray *probe_array, const uint8_t *data_in, @@ -104,7 +106,7 @@ SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize, unsigned int in_offset, out_offset; int *probelist, out_bit; unsigned int i; - uint64_t sample_in, sample_out; + uint8_t *sample_in, *sample_out; if (!probe_array) { sr_err("%s: probe_array was NULL", __func__); @@ -149,14 +151,15 @@ SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize, /* If we reached this point, not all probes are used, so "compress". */ in_offset = out_offset = 0; while (in_offset <= length_in - in_unitsize) { - memcpy(&sample_in, data_in + in_offset, in_unitsize); - sample_out = out_bit = 0; + sample_in = (uint8_t *)data_in + in_offset; + sample_out = (*data_out) + out_offset; + memset(sample_out, 0, out_unitsize); + out_bit = 0; for (i = 0; i < probe_array->len; i++) { - if (sample_in & (1 << (probelist[i]))) - sample_out |= (1 << out_bit); + if (sample_in[probelist[i]>>3] & (1 << (probelist[i]&7))) + sample_out[out_bit>>3] |= (1 << (out_bit&7)); out_bit++; } - memcpy((*data_out) + out_offset, &sample_out, out_unitsize); in_offset += in_unitsize; out_offset += out_unitsize; }