detect version 1.x of libftdi library

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index eb4b1a2cf862d859c50352f29a7e7773c8434ed3..2a1426987bc5f55499aaf65157f601dd138622ae 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -228,8 +228,6 @@ SR_PRIV int sr_err(const char *format, ...);
 enum {
        /** The enabled state of the channel has been changed. */
        SR_CHANNEL_SET_ENABLED = 1 << 0,
-       /** The trigger setup of the channel has been changed. */
-       SR_CHANNEL_SET_TRIGGER = 1 << 1,
 };
 
 SR_PRIV struct sr_channel *sr_channel_new(int index, int type,
@@ -274,6 +272,7 @@ struct sr_session {
        GSList *devs;
        /** List of struct datafeed_callback pointers. */
        GSList *datafeed_callbacks;
+       struct sr_trigger *trigger;
        GTimeVal starttime;
        gboolean running;
 
@@ -332,6 +331,23 @@ SR_PRIV int sr_atod(const char *str, double *ret);
 SR_PRIV int sr_atof(const char *str, float *ret);
 SR_PRIV int sr_atof_ascii(const char *str, float *ret);
 
+/*--- soft-trigger.c --------------------------------------------------------*/
+
+struct soft_trigger_logic {
+       const struct sr_dev_inst *sdi;
+       const struct sr_trigger *trigger;
+       int count;
+       int unitsize;
+       int cur_stage;
+       uint8_t *prev_sample;
+};
+
+SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
+               const struct sr_dev_inst *sdi, struct sr_trigger *trigger);
+SR_PRIV void soft_trigger_logic_free(struct soft_trigger_logic *st);
+SR_PRIV int soft_trigger_logic_check(struct soft_trigger_logic *st, uint8_t *buf,
+               int len);
+
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
 #ifdef HAVE_LIBSERIALPORT