X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fsoft-trigger.c;h=245eb4fff8c94ed652233de2676a341961eeb691;hb=6d0f3508f73e7a6de3c956ef7ca69813de91d7d1;hp=27c71b611b4a82546c7c0cf35eda99a30fe40dab;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git
diff --git a/src/soft-trigger.c b/src/soft-trigger.c
index 27c71b61..245eb4ff 100644
--- a/src/soft-trigger.c
+++ b/src/soft-trigger.c
@@ -17,14 +17,30 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/* @cond PRIVATE */
#define LOG_PREFIX "soft-trigger"
/* @endcond */
+SR_PRIV int logic_channel_unitsize(GSList *channels)
+{
+ int number = 0;
+ struct sr_channel *channel;
+ GSList *l;
+
+ for (l = channels; l; l = l->next) {
+ channel = l->data;
+ if (channel->type == SR_CHANNEL_LOGIC)
+ number++;
+ }
+
+ return (number + 7) / 8;
+}
+
SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
const struct sr_dev_inst *sdi, struct sr_trigger *trigger,
int pre_trigger_samples)
@@ -34,13 +50,22 @@ SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
stl = g_malloc0(sizeof(struct soft_trigger_logic));
stl->sdi = sdi;
stl->trigger = trigger;
- stl->unitsize = (g_slist_length(sdi->channels) + 7) / 8;
+ stl->unitsize = logic_channel_unitsize(sdi->channels);
stl->prev_sample = g_malloc0(stl->unitsize);
stl->pre_trigger_size = stl->unitsize * pre_trigger_samples;
- stl->pre_trigger_buffer = g_malloc(stl->pre_trigger_size);
+ stl->pre_trigger_buffer = g_try_malloc(stl->pre_trigger_size);
+ if (pre_trigger_samples > 0 && !stl->pre_trigger_buffer) {
+ /*
+ * Error out if g_try_malloc() failed (or was invoked as
+ * g_try_malloc(0)) *and* more than 0 pretrigger samples
+ * were requested.
+ */
+ soft_trigger_logic_free(stl);
+ return NULL;
+ }
stl->pre_trigger_head = stl->pre_trigger_buffer;
- if (stl->pre_trigger_size > 0 && stl->pre_trigger_buffer == NULL) {
+ if (stl->pre_trigger_size > 0 && !stl->pre_trigger_buffer) {
soft_trigger_logic_free(stl);
return NULL;
}