Show lib versions in the debug output.

[libsigrokdecode.git] / libsigrokdecode.h

diff --git a/libsigrokdecode.h b/libsigrokdecode.h
index 0aed0f3ee7ce5f5473563372cfd3d810a1d2ade5..ae96d950e5f009f79bb4dd7d845ceb5e4faa0dea 100644 (file)
--- a/libsigrokdecode.h
+++ b/libsigrokdecode.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBSIGROKDECODE_LIBSIGROKDECODE_H
@@ -228,6 +227,46 @@ struct srd_decoder_inst {
        int data_unitsize;
        uint8_t *channel_samples;
        GSList *next_di;
+
+       /** List of conditions a PD wants to wait for. */
+       GSList *condition_list;
+
+       /** Array of booleans denoting which conditions matched. */
+       GArray *match_array;
+
+       /** Absolute start sample number. */
+       uint64_t abs_start_samplenum;
+
+       /** Absolute end sample number. */
+       uint64_t abs_end_samplenum;
+
+       /** Pointer to the buffer/chunk of input samples. */
+       const uint8_t *inbuf;
+
+       /** Length (in bytes) of the input sample buffer. */
+       uint64_t inbuflen;
+
+       /** Absolute current samplenumber. */
+       uint64_t abs_cur_samplenum;
+
+       /** Array of "old" (previous sample) pin values. */
+       GArray *old_pins_array;
+
+       /** Handle for this PD stack's worker thread. */
+       GThread *thread_handle;
+
+       /** Indicates whether new samples are available for processing. */
+       gboolean got_new_samples;
+
+       /** Indicates whether the worker thread has handled all samples. */
+       gboolean handled_all_samples;
+
+       /** Requests termination of wait() and decode(). */
+       gboolean want_wait_terminate;
+
+       GCond got_new_samples_cond;
+       GCond handled_all_samples_cond;
+       GMutex data_mutex;
 };
 
 struct srd_pd_output {
@@ -276,8 +315,8 @@ SRD_API int srd_session_start(struct srd_session *sess);
 SRD_API int srd_session_metadata_set(struct srd_session *sess, int key,
                GVariant *data);
 SRD_API int srd_session_send(struct srd_session *sess,
-               uint64_t start_samplenum, uint64_t end_samplenum,
-               const uint8_t *inbuf, uint64_t inbuflen);
+               uint64_t abs_start_samplenum, uint64_t abs_end_samplenum,
+               const uint8_t *inbuf, uint64_t inbuflen, uint64_t unitsize);
 SRD_API int srd_session_destroy(struct srd_session *sess);
 SRD_API int srd_pd_output_callback_add(struct srd_session *sess,
                int output_type, srd_pd_output_callback cb, void *cb_data);
@@ -295,7 +334,7 @@ SRD_API int srd_decoder_unload_all(void);
 SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
                GHashTable *options);
 SRD_API int srd_inst_channel_set_all(struct srd_decoder_inst *di,
-               GHashTable *channels, int unit_size);
+               GHashTable *channels);
 SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
                const char *id, GHashTable *options);
 SRD_API int srd_inst_stack(struct srd_session *sess,
@@ -310,8 +349,6 @@ SRD_API int srd_log_loglevel_set(int loglevel);
 SRD_API int srd_log_loglevel_get(void);
 SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data);
 SRD_API int srd_log_callback_set_default(void);
-SRD_API int srd_log_logdomain_set(const char *logdomain);
-SRD_API char *srd_log_logdomain_get(void);
 
 /* error.c */
 SRD_API const char *srd_strerror(int error_code);
@@ -326,6 +363,8 @@ SRD_API int srd_lib_version_current_get(void);
 SRD_API int srd_lib_version_revision_get(void);
 SRD_API int srd_lib_version_age_get(void);
 SRD_API const char *srd_lib_version_string_get(void);
+SRD_API GSList *srd_buildinfo_libs_get(void);
+SRD_API char *srd_buildinfo_host_get(void);
 
 #include "version.h"