X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode-internal.h;h=5351b13cb6b9c49bd97cb07b7fb3bbb1cb017c56;hp=60914c312c689a38ce63d4e1a82ef6149c32a737;hb=0736708e58a10e1903c47d72fee5343cccb1ce95;hpb=a8b72b05cad9fd63e52079acb395a6694ed5f6b6

diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h
index 60914c3..5351b13 100644
--- a/sigrokdecode-internal.h
+++ b/sigrokdecode-internal.h
@@ -2,6 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,23 +23,22 @@
 #define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H
 
 #include "sigrokdecode.h"
-// #include <stdarg.h>
-// #include <glib.h>
-
-/*--- Macros ----------------------------------------------------------------*/
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef ARRAY_AND_SIZE
-#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
-#endif
 
 /*--- controller.c ----------------------------------------------------------*/
 
+SRD_PRIV int add_modulepath(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 pd_add(struct srd_decoder_inst *di, int output_type,
-		    char *output_id);
+		    const char *output_id);
+
+/*--- decoder.c -------------------------------------------------------------*/
+
+SRD_PRIV void *srd_find_callback(int output_type);
 
 /*--- exception.c -----------------------------------------------------------*/
 
@@ -55,9 +55,13 @@ SRD_PRIV int srd_err(const char *format, ...);
 
 /*--- util.c ----------------------------------------------------------------*/
 
-SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr);
-SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr);
-SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr);
-SRD_PRIV int py_strlist_to_char(PyObject *py_strlist, char ***outstr);
+SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
+			    char **outstr);
+SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
+				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);
 
 #endif