X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode.h;h=7f75ab2d5baf2a16e1ef951d11d4653260ec2bd6;hp=db06d43dcdccc1ade489ee19473c6a49ea046f04;hb=35b380b1156434b73d4a976c68f5ab3604c8510a;hpb=2372b1998ae5d252433d7a7a07744ba2ea81b96e

diff --git a/libsigrokdecode.h b/libsigrokdecode.h
index db06d43..7f75ab2 100644
--- a/libsigrokdecode.h
+++ b/libsigrokdecode.h
@@ -22,7 +22,6 @@
 #ifndef LIBSIGROKDECODE_SIGROKDECODE_H
 #define LIBSIGROKDECODE_SIGROKDECODE_H
 
-#include <Python.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <stdint.h>
 #include <glib.h>
 
@@ -65,7 +64,7 @@ struct srd_session;
  */
 
 /** Status/error codes returned by libsigrokdecode functions. */
-enum {
+enum srd_error_code {
 	SRD_OK               =  0, /**< No error */
 	SRD_ERR              = -1, /**< Generic/unspecified error */
 	SRD_ERR_MALLOC       = -2, /**< Malloc/calloc/realloc error */
@@ -81,7 +80,7 @@ enum {
 };
 
 /* libsigrokdecode loglevels. */
-enum {
+enum srd_loglevel {
 	SRD_LOG_NONE = 0, /**< Output no messages at all. */
 	SRD_LOG_ERR  = 1, /**< Output error messages. */
 	SRD_LOG_WARN = 2, /**< Output warnings. */
@@ -126,14 +125,14 @@ enum {
  *   - add a check in module_sigrokdecode.c:Decoder_put()
  *   - add a debug string in type_decoder.c:OUTPUT_TYPES
  */
-enum {
+enum srd_output_type {
 	SRD_OUTPUT_ANN,
 	SRD_OUTPUT_PYTHON,
 	SRD_OUTPUT_BINARY,
 	SRD_OUTPUT_META,
 };
 
-enum {
+enum srd_configkey {
 	SRD_CONF_SAMPLERATE = 10000,
 };
 
@@ -184,10 +183,10 @@ struct srd_decoder {
 	GSList *options;
 
 	/** Python module. */
-	PyObject *py_mod;
+	void *py_mod;
 
 	/** sigrokdecode.Decoder class. */
-	PyObject *py_dec;
+	void *py_dec;
 };
 
 /**
@@ -221,7 +220,7 @@ struct srd_decoder_annotation_row {
 struct srd_decoder_inst {
 	struct srd_decoder *decoder;
 	struct srd_session *sess;
-	PyObject *py_inst;
+	void *py_inst;
 	char *inst_id;
 	GSList *pd_output;
 	int dec_num_channels;
@@ -267,23 +266,6 @@ struct srd_pd_callback {
 	void *cb_data;
 };
 
-/* Custom Python types: */
-
-typedef struct {
-	PyObject_HEAD
-} srd_Decoder;
-
-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;
-
-
 /* srd.c */
 SRD_API int srd_init(const char *path);
 SRD_API int srd_exit(void);