X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=a4b5c2cd43b0a6b4aafec72a6a2748e518c94501;hp=cf52264493052b5600aaa16719f28dfac13f3a44;hb=94d43b37bd34263f5ed9f7135aac5fe7413c7f07;hpb=6b741b128c9838d2c417e56a6e8b5d377467a3ff

diff --git a/sigrokdecode.h b/sigrokdecode.h
index cf52264..a4b5c2c 100644
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -64,8 +64,8 @@ extern "C" {
 #define SRD_LOG_SPEW   5 /**< Output very noisy debug messages. */
 
 enum {
-	SRD_OUTPUT_ANNOTATION,
-	SRD_OUTPUT_PROTOCOL,
+	SRD_OUTPUT_ANN,
+	SRD_OUTPUT_PROTO,
 	SRD_OUTPUT_BINARY,
 	/* When adding an output type, don't forget to expose it to PDs in:
 	 *     controller.c:PyInit_sigrokdecode()
@@ -135,7 +135,7 @@ struct srd_pd_output {
 	int pdo_id;
 	int output_type;
 	struct srd_decoder *decoder;
-	char *protocol_id;
+	char *proto_id;
 };
 
 typedef struct {
@@ -147,17 +147,17 @@ typedef struct {
 	PyObject *sample;
 } srd_logic;
 
-struct srd_protocol_data {
+struct srd_proto_data {
 	uint64_t start_sample;
 	uint64_t end_sample;
 	struct srd_pd_output *pdo;
-	int annotation_format;
+	int ann_format;
 	void *data;
 };
 
 struct srd_pd_callback {
 	int output_type;
-	void (*callback)(struct srd_protocol_data *);
+	void (*callback)(struct srd_proto_data *);
 };