X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode-internal.h;h=e9aef649b93697e430cc3586c2298b9c613e3c7c;hp=718f11eb67ee7f7d47686e9e90b39deddaced075;hb=1483fb220ce56405433aee298d1637f6b041ac2b;hpb=c1f86f02a149f46609273e1bd5b42696d544727a

diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index 718f11e..e9aef64 100644
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -22,30 +22,50 @@
 #ifndef LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H
 #define LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H
 
+#include <Python.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 
-/*--- controller.c ----------------------------------------------------------*/
+/* Custom Python types: */
 
-SRD_PRIV int srd_decoder_searchpath_add(const char *path);
-SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
-SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
-			     const struct srd_decoder_inst *dec,
-			     const uint8_t *inbuf, uint64_t inbuflen);
-SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di);
-SRD_PRIV void srd_inst_free_all(GSList *stack);
-SRD_PRIV int srd_inst_pd_output_add(struct srd_decoder_inst *di,
-				    int output_type, const char *output_id);
+typedef struct {
+	PyObject_HEAD
+	struct srd_decoder_inst *di;
+	uint64_t start_samplenum;
+	unsigned int itercnt;
+	uint8_t *inbuf;
+	uint64_t inbuflen;
+	PyObject *sample;
+} srd_logic;
 
-/*--- decoder.c -------------------------------------------------------------*/
+struct srd_session {
+	int session_id;
 
-SRD_PRIV void *srd_pd_output_callback_find(int output_type);
+	/* List of decoder instances. */
+	GSList *di_list;
 
-/*--- exception.c -----------------------------------------------------------*/
+	/* List of frontend callbacks to receive decoder output. */
+	GSList *callbacks;
+};
 
-SRD_PRIV void srd_exception_catch(const char *format, ...);
+/* srd.c */
+SRD_PRIV int srd_decoder_searchpath_add(const char *path);
 
-/*--- log.c -----------------------------------------------------------------*/
+/* session.c */
+SRD_PRIV int session_is_valid(struct srd_session *sess);
+SRD_PRIV struct srd_pd_callback *srd_pd_output_callback_find(struct srd_session *sess,
+		int output_type);
 
+/* instance.c */
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj( const GSList *stack,
+		const PyObject *obj);
+SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di);
+SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
+		uint64_t start_samplenum, uint64_t end_samplenum,
+		const uint8_t *inbuf, uint64_t inbuflen);
+SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di);
+SRD_PRIV void srd_inst_free_all(struct srd_session *sess, GSList *stack);
+
+/* log.c */
 SRD_PRIV int srd_log(int loglevel, const char *format, ...);
 SRD_PRIV int srd_spew(const char *format, ...);
 SRD_PRIV int srd_dbg(const char *format, ...);
@@ -53,15 +73,18 @@ SRD_PRIV int srd_info(const char *format, ...);
 SRD_PRIV int srd_warn(const char *format, ...);
 SRD_PRIV int srd_err(const char *format, ...);
 
-/*--- util.c ----------------------------------------------------------------*/
+/* module_sigrokdecode.c */
+PyMODINIT_FUNC PyInit_sigrokdecode(void);
 
+/* util.c */
 SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
-			    char **outstr);
+        char **outstr);
 SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
-				char **outstr);
+        char **outstr);
 SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr);
-SRD_PRIV int py_strlist_to_char(const PyObject *py_strlist, char ***outstr);
-SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack,
-						       const PyObject *obj);
+SRD_PRIV int py_strseq_to_char(const PyObject *py_strseq, char ***outstr);
+
+/* exception.c */
+SRD_PRIV void srd_exception_catch(const char *format, ...);
 
 #endif