srd/cli/qt: Some more API consistency renames.

[libsigrokdecode.git] / sigrokdecode-internal.h

diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h
index 94c0c49b074230c7f3fd764a5b5384b889ace0c7..42e9118e915052a08a11bdc727a9ae03cafc6add 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>
+ * 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
@@ -18,29 +19,49 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGROKDECODE_SIGROKDECODE_INTERNAL_H
-#define SIGROKDECODE_SIGROKDECODE_INTERNAL_H
+#ifndef LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H
+#define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H
 
-// #include <stdarg.h>
-// #include <glib.h>
+#include "sigrokdecode.h"
 
-/*--- Macros ----------------------------------------------------------------*/
+/*--- controller.c ----------------------------------------------------------*/
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
+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,
+                   const char *output_id);
 
-#ifndef ARRAY_AND_SIZE
-#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
-#endif
+/*--- decoder.c -------------------------------------------------------------*/
+
+SRD_PRIV void *srd_pd_output_callback_find(int output_type);
+
+/*--- exception.c -----------------------------------------------------------*/
+
+SRD_PRIV void catch_exception(const char *format, ...);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-int srd_log(int loglevel, const char *format, ...);
-int srd_spew(const char *format, ...);
-int srd_dbg(const char *format, ...);
-int srd_info(const char *format, ...);
-int srd_warn(const char *format, ...);
-int srd_err(const char *format, ...);
+SRD_PRIV int srd_log(int loglevel, const char *format, ...);
+SRD_PRIV int srd_spew(const char *format, ...);
+SRD_PRIV int srd_dbg(const char *format, ...);
+SRD_PRIV int srd_info(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(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