X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode.h;h=b9cc921287e876347ceea9d1ea08f61a46046f2e;hp=55620a7f52551df6e01ea1521711ce34fdf12496;hb=HEAD;hpb=c7b211b18466c69df976a6d71f1c8ba30145f14c

diff --git a/libsigrokdecode.h b/libsigrokdecode.h
index 55620a7..ea17cb8 100644
--- a/libsigrokdecode.h
+++ b/libsigrokdecode.h
@@ -106,29 +106,34 @@ enum srd_loglevel {
  */
 
 /* Marks public libsigrokdecode API symbols. */
-#ifndef _WIN32
-#define SRD_API __attribute__((visibility("default")))
+#if defined _WIN32
+#  if defined DLL_EXPORT
+#    define SRD_API __declspec(dllexport)
+#  else
+#    define SRD_API extern
+#  endif
 #else
-#define SRD_API
+#  define SRD_API __attribute__((visibility("default")))
 #endif
 
 /* Marks private, non-public libsigrokdecode symbols (not part of the API). */
-#ifndef _WIN32
-#define SRD_PRIV __attribute__((visibility("hidden")))
+#if defined _WIN32
+#  define SRD_PRIV /* EMPTY */
 #else
-#define SRD_PRIV
+#  define SRD_PRIV __attribute__((visibility("hidden")))
 #endif
 
 /*
  * When adding an output type, don't forget to...
- *   - expose it to PDs in controller.c:PyInit_sigrokdecode()
- *   - add a check in module_sigrokdecode.c:Decoder_put()
- *   - add a debug string in type_decoder.c:OUTPUT_TYPES
+ *   - expose it to PDs in module_sigrokdecode.c:PyInit_sigrokdecode()
+ *   - add a check in type_decoder.c:Decoder_put()
+ *   - add a debug string in type_decoder.c:output_type_name()
  */
 enum srd_output_type {
 	SRD_OUTPUT_ANN,
 	SRD_OUTPUT_PYTHON,
 	SRD_OUTPUT_BINARY,
+	SRD_OUTPUT_LOGIC,
 	SRD_OUTPUT_META,
 };
 
@@ -161,6 +166,9 @@ struct srd_decoder {
 	/** List of possible decoder output IDs. */
 	GSList *outputs;
 
+	/** List of tags associated with this decoder. */
+	GSList *tags;
+
 	/** List of channels required by this decoder. */
 	GSList *channels;
 
@@ -168,8 +176,8 @@ struct srd_decoder {
 	GSList *opt_channels;
 
 	/**
-	 * List of NULL-terminated char[], containing descriptions of the
-	 * supported annotation output.
+	 * List of annotation classes. Each list item is a GSList itself, with
+	 * two NUL-terminated strings: name and description.
 	 */
 	GSList *annotations;
 
@@ -180,11 +188,16 @@ struct srd_decoder {
 	GSList *annotation_rows;
 
 	/**
-	 * List of NULL-terminated char[], containing descriptions of the
-	 * supported binary output.
+	 * List of binary classes. Each list item is a GSList itself, with
+	 * two NUL-terminated strings: name and description.
 	 */
 	GSList *binary;
 
+	/**
+	 * List of logic output channels (item: id, description).
+	 */
+	GSList *logic_output_channels;
+
 	/** List of decoder options. */
 	GSList *options;
 
@@ -229,6 +242,11 @@ struct srd_decoder_annotation_row {
 	GSList *ann_classes;
 };
 
+struct srd_decoder_logic_output_channel {
+	char *id;
+	char *desc;
+};
+
 struct srd_decoder_inst {
 	struct srd_decoder *decoder;
 	struct srd_session *sess;
@@ -277,6 +295,9 @@ struct srd_decoder_inst {
 	/** Requests termination of wait() and decode(). */
 	gboolean want_wait_terminate;
 
+	/** Requests that .wait() terminates a Python iteration. */
+	gboolean communicate_eof;
+
 	/** Indicates the current state of the decoder stack. */
 	int decoder_state;
 
@@ -303,13 +324,18 @@ struct srd_proto_data {
 	void *data;
 };
 struct srd_proto_data_annotation {
-	int ann_class;
+	int ann_class; /* Index into "struct srd_decoder"->annotations. */
 	char **ann_text;
 };
 struct srd_proto_data_binary {
-	int bin_class;
+	int bin_class; /* Index into "struct srd_decoder"->binary. */
 	uint64_t size;
-	const unsigned char *data;
+	const uint8_t *data;
+};
+struct srd_proto_data_logic {
+	int logic_group;
+	uint64_t repeat_count; /* Number of times the value in data was repeated. */
+	const uint8_t *data; /* Bitfield containing the states of the logic outputs */
 };
 
 typedef void (*srd_pd_output_callback)(struct srd_proto_data *pdata,
@@ -334,6 +360,7 @@ SRD_API int srd_session_metadata_set(struct srd_session *sess, int key,
 SRD_API int srd_session_send(struct srd_session *sess,
 		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_send_eof(struct srd_session *sess);
 SRD_API int srd_session_terminate_reset(struct srd_session *sess);
 SRD_API int srd_session_destroy(struct srd_session *sess);
 SRD_API int srd_pd_output_callback_add(struct srd_session *sess,