srd: last public/private fix, and docs for all publis functions.

[libsigrokdecode.git] / sigrokdecode-internal.h

diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h
index 86a77e4fa6d4bc18b46fcabbaeb9e7bba6707b77..bdd7563d7c777987150432b59a548662ed4d0596 100644 (file)
--- 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>
  * 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
  *
  * 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,8 +23,6 @@
 #define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H
 
 #include "sigrokdecode.h"
 #define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H
 
 #include "sigrokdecode.h"

-// #include <stdarg.h>
-// #include <glib.h>

 
 /*--- Macros ----------------------------------------------------------------*/
 
 
 /*--- Macros ----------------------------------------------------------------*/
 


@@ -35,6 +34,25 @@
 #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
 #endif
 
 #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,
+                               struct srd_decoder_inst *dec,
+                               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);
+
+/*--- decoder.c -------------------------------------------------------------*/
+SRD_PRIV void *srd_find_callback(int output_type);
+
+/*--- exception.c -----------------------------------------------------------*/
+
+SRD_PRIV void catch_exception(const char *format, ...);
+

 /*--- log.c -----------------------------------------------------------------*/
 
 SRD_PRIV int srd_log(int loglevel, const char *format, ...);
 /*--- log.c -----------------------------------------------------------------*/
 
 SRD_PRIV int srd_log(int loglevel, const char *format, ...);


@@ -44,4 +62,13 @@ SRD_PRIV int srd_info(const char *format, ...);
 SRD_PRIV int srd_warn(const char *format, ...);
 SRD_PRIV int srd_err(const char *format, ...);
 
 SRD_PRIV int srd_warn(const char *format, ...);
 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 struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
+                                                             PyObject *obj);
+

 #endif
 #endif