From c1f86f02a149f46609273e1bd5b42696d544727a Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 3 May 2013 14:49:21 +0200 Subject: Main header is now. This matches the convention used in libsigrok. Potential other headers might end up in libsigrokdecode/, but only libsigrokdecode.h is meant to be #included by frontends directly. --- .gitignore | 2 +- Makefile.am | 5 +- configure.ac | 2 +- controller.c | 4 +- decoder.c | 4 +- exception.c | 4 +- libsigrokdecode-internal.h | 67 +++++++++ libsigrokdecode.h.in | 330 +++++++++++++++++++++++++++++++++++++++++++++ log.c | 4 +- module_sigrokdecode.c | 4 +- sigrokdecode-internal.h | 67 --------- sigrokdecode.h.in | 330 --------------------------------------------- type_decoder.c | 4 +- type_logic.c | 2 +- util.c | 4 +- version.c | 2 +- 16 files changed, 418 insertions(+), 417 deletions(-) create mode 100644 libsigrokdecode-internal.h create mode 100644 libsigrokdecode.h.in delete mode 100644 sigrokdecode-internal.h delete mode 100644 sigrokdecode.h.in diff --git a/.gitignore b/.gitignore index da30138..b812ba6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ map missing stamp-h1 autostuff/ -sigrokdecode.h +libsigrokdecode.h ChangeLog INSTALL diff --git a/Makefile.am b/Makefile.am index e6f2ced..d3f91b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,8 +31,9 @@ libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \ -DDECODERS_DIR='"$(DECODERS_DIR)"' libsigrokdecode_la_LDFLAGS = $(SRD_LIB_LDFLAGS) $(LDFLAGS_PYTHON) -include_HEADERS = sigrokdecode.h -noinst_HEADERS = sigrokdecode-internal.h +library_includedir = $(includedir)/libsigrokdecode +library_include_HEADERS = libsigrokdecode.h +noinst_HEADERS = libsigrokdecode-internal.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsigrokdecode.pc diff --git a/configure.ac b/configure.ac index 5431835..3ed527f 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,7 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO) AC_SUBST(SRD_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile - sigrokdecode.h + libsigrokdecode.h libsigrokdecode.pc contrib/Makefile decoders/Makefile diff --git a/controller.c b/controller.c index e023b71..c9825b9 100644 --- a/controller.c +++ b/controller.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include #include diff --git a/decoder.c b/decoder.c index c8eb98f..21e24c4 100644 --- a/decoder.c +++ b/decoder.c @@ -19,8 +19,8 @@ */ #include "config.h" -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include /** diff --git a/exception.c b/exception.c index cd9d2b2..1ce66a8 100644 --- a/exception.c +++ b/exception.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include #include diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h new file mode 100644 index 0000000..718f11e --- /dev/null +++ b/libsigrokdecode-internal.h @@ -0,0 +1,67 @@ +/* + * This file is part of the libsigrokdecode project. + * + * Copyright (C) 2011 Uwe Hermann + * Copyright (C) 2012 Bert Vermeulen + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H +#define LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H + +#include "libsigrokdecode.h" + +/*--- controller.c ----------------------------------------------------------*/ + +SRD_PRIV int srd_decoder_searchpath_add(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 srd_inst_pd_output_add(struct srd_decoder_inst *di, + int output_type, const char *output_id); + +/*--- decoder.c -------------------------------------------------------------*/ + +SRD_PRIV void *srd_pd_output_callback_find(int output_type); + +/*--- exception.c -----------------------------------------------------------*/ + +SRD_PRIV void srd_exception_catch(const char *format, ...); + +/*--- log.c -----------------------------------------------------------------*/ + +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 diff --git a/libsigrokdecode.h.in b/libsigrokdecode.h.in new file mode 100644 index 0000000..877aeb1 --- /dev/null +++ b/libsigrokdecode.h.in @@ -0,0 +1,330 @@ +/* + * This file is part of the libsigrokdecode project. + * + * Copyright (C) 2010 Uwe Hermann + * Copyright (C) 2012 Bert Vermeulen + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LIBSIGROKDECODE_SIGROKDECODE_H +#define LIBSIGROKDECODE_SIGROKDECODE_H + +#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @file + * + * The public libsigrokdecode header file to be used by frontends. + * + * This is the only file that libsigrokdecode users (frontends) are supposed + * to use and include. There are other header files which get installed with + * libsigrokdecode, but those are not meant to be used directly by frontends. + * + * The correct way to get/use the libsigrokdecode API functions is: + * + * @code{.c} + * #include + * @endcode + */ + +/* + * Package version macros (can be used for conditional compilation). + */ + +/** The libsigrokdecode package 'major' version number. */ +#define SRD_PACKAGE_VERSION_MAJOR @SRD_PACKAGE_VERSION_MAJOR@ + +/** The libsigrokdecode package 'minor' version number. */ +#define SRD_PACKAGE_VERSION_MINOR @SRD_PACKAGE_VERSION_MINOR@ + +/** The libsigrokdecode package 'micro' version number. */ +#define SRD_PACKAGE_VERSION_MICRO @SRD_PACKAGE_VERSION_MICRO@ + +/** The libsigrokdecode package version ("major.minor.micro") as string. */ +#define SRD_PACKAGE_VERSION_STRING "@SRD_PACKAGE_VERSION@" + +/* + * Library/libtool version macros (can be used for conditional compilation). + */ + +/** The libsigrokdecode libtool 'current' version number. */ +#define SRD_LIB_VERSION_CURRENT @SRD_LIB_VERSION_CURRENT@ + +/** The libsigrokdecode libtool 'revision' version number. */ +#define SRD_LIB_VERSION_REVISION @SRD_LIB_VERSION_REVISION@ + +/** The libsigrokdecode libtool 'age' version number. */ +#define SRD_LIB_VERSION_AGE @SRD_LIB_VERSION_AGE@ + +/** The libsigrokdecode libtool version ("current:revision:age") as string. */ +#define SRD_LIB_VERSION_STRING "@SRD_LIB_VERSION@" + +/* + * Status/error codes returned by libsigrokdecode functions. + * + * All possible return codes of libsigrokdecode functions must be listed here. + * Functions should never return hardcoded numbers as status, but rather + * use these #defines instead. All error codes are negative numbers. + * + * The error codes are globally unique in libsigrokdecode, i.e. if one of the + * libsigrokdecode functions returns a "malloc error" it must be exactly the + * same return value as used by all other functions to indicate "malloc error". + * There must be no functions which indicate two different errors via the + * same return code. + * + * Also, for compatibility reasons, no defined return codes are ever removed + * or reused for different #defines later. You can only add new #defines and + * return codes, but never remove or redefine existing ones. + */ +#define SRD_OK 0 /**< No error */ +#define SRD_ERR -1 /**< Generic/unspecified error */ +#define SRD_ERR_MALLOC -2 /**< Malloc/calloc/realloc error */ +#define SRD_ERR_ARG -3 /**< Function argument error */ +#define SRD_ERR_BUG -4 /**< Errors hinting at internal bugs */ +#define SRD_ERR_PYTHON -5 /**< Python C API error */ +#define SRD_ERR_DECODERS_DIR -6 /**< Protocol decoder path invalid */ + +/* libsigrokdecode loglevels. */ +#define SRD_LOG_NONE 0 /**< Output no messages at all. */ +#define SRD_LOG_ERR 1 /**< Output error messages. */ +#define SRD_LOG_WARN 2 /**< Output warnings. */ +#define SRD_LOG_INFO 3 /**< Output informational messages. */ +#define SRD_LOG_DBG 4 /**< Output debug messages. */ +#define SRD_LOG_SPEW 5 /**< Output very noisy debug messages. */ + +/* + * Use SRD_API to mark public API symbols, and SRD_PRIV for private symbols. + * + * Variables and functions marked 'static' are private already and don't + * need SRD_PRIV. However, functions which are not static (because they need + * to be used in other libsigrokdecode-internal files) but are also not + * meant to be part of the public libsigrokdecode API, must use SRD_PRIV. + * + * This uses the 'visibility' feature of gcc (requires gcc >= 4.0). + * + * This feature is not available on MinGW/Windows, as it is a feature of + * ELF files and MinGW/Windows uses PE files. + * + * Details: http://gcc.gnu.org/wiki/Visibility + */ + +/* Marks public libsigrokdecode API symbols. */ +#ifndef _WIN32 +#define SRD_API __attribute__((visibility("default"))) +#else +#define SRD_API +#endif + +/* Marks private, non-public libsigrokdecode symbols (not part of the API). */ +#ifndef _WIN32 +#define SRD_PRIV __attribute__((visibility("hidden"))) +#else +#define SRD_PRIV +#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 + */ +enum { + SRD_OUTPUT_ANN, + SRD_OUTPUT_PROTO, + SRD_OUTPUT_BINARY, +}; + +#define SRD_MAX_NUM_PROBES 64 + +struct srd_decoder { + /** The decoder ID. Must be non-NULL and unique for all decoders. */ + char *id; + + /** The (short) decoder name. Must be non-NULL. */ + char *name; + + /** The (long) decoder name. Must be non-NULL. */ + char *longname; + + /** A (short, one-line) description of the decoder. Must be non-NULL. */ + char *desc; + + /** + * The license of the decoder. Valid values: "gplv2+", "gplv3+". + * Other values are currently not allowed. Must be non-NULL. + */ + char *license; + + /** List of probes required by this decoder. */ + GSList *probes; + + /** List of optional probes for this decoder. */ + GSList *opt_probes; + + /** + * List of NULL-terminated char[], containing descriptions of the + * supported annotation output. + */ + GSList *annotations; + + /** List of decoder options. */ + GSList *options; + + /** Python module. */ + PyObject *py_mod; + + /** sigrokdecode.Decoder class. */ + PyObject *py_dec; +}; + +/** + * Structure which contains information about one protocol decoder probe. + * For example, I2C has two probes, SDA and SCL. + */ +struct srd_probe { + /** The ID of the probe. Must be non-NULL. */ + char *id; + /** The name of the probe. Must not be NULL. */ + char *name; + /** The description of the probe. Must not be NULL. */ + char *desc; + /** The index of the probe, i.e. its order in the list of probes. */ + int order; +}; + +struct srd_decoder_option { + char *id; + char *desc; + GVariant *def; +}; + +struct srd_decoder_inst { + struct srd_decoder *decoder; + PyObject *py_inst; + char *inst_id; + GSList *pd_output; + int dec_num_probes; + int *dec_probemap; + int data_num_probes; + int data_unitsize; + uint64_t data_samplerate; + GSList *next_di; +}; + +struct srd_pd_output { + int pdo_id; + int output_type; + struct srd_decoder_inst *di; + char *proto_id; +}; + +struct srd_proto_data { + uint64_t start_sample; + uint64_t end_sample; + struct srd_pd_output *pdo; + int ann_format; + void *data; +}; + +typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata, + void *cb_data); + +struct srd_pd_callback { + int output_type; + srd_pd_output_callback_t cb; + void *cb_data; +}; + +/* Custom Python types: */ + +typedef struct { + PyObject_HEAD +} srd_Decoder; + +typedef struct { + PyObject_HEAD + struct srd_decoder_inst *di; + uint64_t start_samplenum; + unsigned int itercnt; + uint8_t *inbuf; + uint64_t inbuflen; + PyObject *sample; +} srd_logic; + +/*--- controller.c ----------------------------------------------------------*/ + +SRD_API int srd_init(const char *path); +SRD_API int srd_exit(void); +SRD_API int srd_inst_option_set(struct srd_decoder_inst *di, + GHashTable *options); +SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di, + GHashTable *probes); +SRD_API struct srd_decoder_inst *srd_inst_new(const char *id, + GHashTable *options); +SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from, + struct srd_decoder_inst *di_to); +SRD_API struct srd_decoder_inst *srd_inst_find_by_id(const char *inst_id); +SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate); +SRD_API int srd_session_send(uint64_t start_samplenum, const uint8_t *inbuf, + uint64_t inbuflen); +SRD_API int srd_pd_output_callback_add(int output_type, + srd_pd_output_callback_t cb, void *cb_data); + +/*--- decoder.c -------------------------------------------------------------*/ + +SRD_API const GSList *srd_decoder_list(void); +SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id); +SRD_API int srd_decoder_load(const char *name); +SRD_API int srd_decoder_unload(struct srd_decoder *dec); +SRD_API int srd_decoder_load_all(void); +SRD_API int srd_decoder_unload_all(void); +SRD_API char *srd_decoder_doc_get(const struct srd_decoder *dec); + +/*--- log.c -----------------------------------------------------------------*/ + +typedef int (*srd_log_callback_t)(void *cb_data, int loglevel, + const char *format, va_list args); + +SRD_API int srd_log_loglevel_set(int loglevel); +SRD_API int srd_log_loglevel_get(void); +SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data); +SRD_API int srd_log_callback_set_default(void); +SRD_API int srd_log_logdomain_set(const char *logdomain); +SRD_API char *srd_log_logdomain_get(void); + +/*--- version.c -------------------------------------------------------------*/ + +SRD_API int srd_package_version_major_get(void); +SRD_API int srd_package_version_minor_get(void); +SRD_API int srd_package_version_micro_get(void); +SRD_API const char *srd_package_version_string_get(void); + +SRD_API int srd_lib_version_current_get(void); +SRD_API int srd_lib_version_revision_get(void); +SRD_API int srd_lib_version_age_get(void); +SRD_API const char *srd_lib_version_string_get(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/log.c b/log.c index 49a18eb..36dcd95 100644 --- a/log.c +++ b/log.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include #include diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c index 557ad1a..f88a6e9 100644 --- a/module_sigrokdecode.c +++ b/module_sigrokdecode.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" /** @cond PRIVATE */ diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h deleted file mode 100644 index b969356..0000000 --- a/sigrokdecode-internal.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is part of the libsigrokdecode project. - * - * Copyright (C) 2011 Uwe Hermann - * Copyright (C) 2012 Bert Vermeulen - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H -#define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H - -#include "sigrokdecode.h" - -/*--- controller.c ----------------------------------------------------------*/ - -SRD_PRIV int srd_decoder_searchpath_add(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 srd_inst_pd_output_add(struct srd_decoder_inst *di, - int output_type, const char *output_id); - -/*--- decoder.c -------------------------------------------------------------*/ - -SRD_PRIV void *srd_pd_output_callback_find(int output_type); - -/*--- exception.c -----------------------------------------------------------*/ - -SRD_PRIV void srd_exception_catch(const char *format, ...); - -/*--- log.c -----------------------------------------------------------------*/ - -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 diff --git a/sigrokdecode.h.in b/sigrokdecode.h.in deleted file mode 100644 index 7aac0ba..0000000 --- a/sigrokdecode.h.in +++ /dev/null @@ -1,330 +0,0 @@ -/* - * This file is part of the libsigrokdecode project. - * - * Copyright (C) 2010 Uwe Hermann - * Copyright (C) 2012 Bert Vermeulen - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef LIBSIGROKDECODE_SIGROKDECODE_H -#define LIBSIGROKDECODE_SIGROKDECODE_H - -#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @file - * - * The public libsigrokdecode header file to be used by frontends. - * - * This is the only file that libsigrokdecode users (frontends) are supposed - * to use and include. There are other header files which get installed with - * libsigrokdecode, but those are not meant to be used directly by frontends. - * - * The correct way to get/use the libsigrokdecode API functions is: - * - * @code{.c} - * #include - * @endcode - */ - -/* - * Package version macros (can be used for conditional compilation). - */ - -/** The libsigrokdecode package 'major' version number. */ -#define SRD_PACKAGE_VERSION_MAJOR @SRD_PACKAGE_VERSION_MAJOR@ - -/** The libsigrokdecode package 'minor' version number. */ -#define SRD_PACKAGE_VERSION_MINOR @SRD_PACKAGE_VERSION_MINOR@ - -/** The libsigrokdecode package 'micro' version number. */ -#define SRD_PACKAGE_VERSION_MICRO @SRD_PACKAGE_VERSION_MICRO@ - -/** The libsigrokdecode package version ("major.minor.micro") as string. */ -#define SRD_PACKAGE_VERSION_STRING "@SRD_PACKAGE_VERSION@" - -/* - * Library/libtool version macros (can be used for conditional compilation). - */ - -/** The libsigrokdecode libtool 'current' version number. */ -#define SRD_LIB_VERSION_CURRENT @SRD_LIB_VERSION_CURRENT@ - -/** The libsigrokdecode libtool 'revision' version number. */ -#define SRD_LIB_VERSION_REVISION @SRD_LIB_VERSION_REVISION@ - -/** The libsigrokdecode libtool 'age' version number. */ -#define SRD_LIB_VERSION_AGE @SRD_LIB_VERSION_AGE@ - -/** The libsigrokdecode libtool version ("current:revision:age") as string. */ -#define SRD_LIB_VERSION_STRING "@SRD_LIB_VERSION@" - -/* - * Status/error codes returned by libsigrokdecode functions. - * - * All possible return codes of libsigrokdecode functions must be listed here. - * Functions should never return hardcoded numbers as status, but rather - * use these #defines instead. All error codes are negative numbers. - * - * The error codes are globally unique in libsigrokdecode, i.e. if one of the - * libsigrokdecode functions returns a "malloc error" it must be exactly the - * same return value as used by all other functions to indicate "malloc error". - * There must be no functions which indicate two different errors via the - * same return code. - * - * Also, for compatibility reasons, no defined return codes are ever removed - * or reused for different #defines later. You can only add new #defines and - * return codes, but never remove or redefine existing ones. - */ -#define SRD_OK 0 /**< No error */ -#define SRD_ERR -1 /**< Generic/unspecified error */ -#define SRD_ERR_MALLOC -2 /**< Malloc/calloc/realloc error */ -#define SRD_ERR_ARG -3 /**< Function argument error */ -#define SRD_ERR_BUG -4 /**< Errors hinting at internal bugs */ -#define SRD_ERR_PYTHON -5 /**< Python C API error */ -#define SRD_ERR_DECODERS_DIR -6 /**< Protocol decoder path invalid */ - -/* libsigrokdecode loglevels. */ -#define SRD_LOG_NONE 0 /**< Output no messages at all. */ -#define SRD_LOG_ERR 1 /**< Output error messages. */ -#define SRD_LOG_WARN 2 /**< Output warnings. */ -#define SRD_LOG_INFO 3 /**< Output informational messages. */ -#define SRD_LOG_DBG 4 /**< Output debug messages. */ -#define SRD_LOG_SPEW 5 /**< Output very noisy debug messages. */ - -/* - * Use SRD_API to mark public API symbols, and SRD_PRIV for private symbols. - * - * Variables and functions marked 'static' are private already and don't - * need SRD_PRIV. However, functions which are not static (because they need - * to be used in other libsigrokdecode-internal files) but are also not - * meant to be part of the public libsigrokdecode API, must use SRD_PRIV. - * - * This uses the 'visibility' feature of gcc (requires gcc >= 4.0). - * - * This feature is not available on MinGW/Windows, as it is a feature of - * ELF files and MinGW/Windows uses PE files. - * - * Details: http://gcc.gnu.org/wiki/Visibility - */ - -/* Marks public libsigrokdecode API symbols. */ -#ifndef _WIN32 -#define SRD_API __attribute__((visibility("default"))) -#else -#define SRD_API -#endif - -/* Marks private, non-public libsigrokdecode symbols (not part of the API). */ -#ifndef _WIN32 -#define SRD_PRIV __attribute__((visibility("hidden"))) -#else -#define SRD_PRIV -#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 - */ -enum { - SRD_OUTPUT_ANN, - SRD_OUTPUT_PROTO, - SRD_OUTPUT_BINARY, -}; - -#define SRD_MAX_NUM_PROBES 64 - -struct srd_decoder { - /** The decoder ID. Must be non-NULL and unique for all decoders. */ - char *id; - - /** The (short) decoder name. Must be non-NULL. */ - char *name; - - /** The (long) decoder name. Must be non-NULL. */ - char *longname; - - /** A (short, one-line) description of the decoder. Must be non-NULL. */ - char *desc; - - /** - * The license of the decoder. Valid values: "gplv2+", "gplv3+". - * Other values are currently not allowed. Must be non-NULL. - */ - char *license; - - /** List of probes required by this decoder. */ - GSList *probes; - - /** List of optional probes for this decoder. */ - GSList *opt_probes; - - /** - * List of NULL-terminated char[], containing descriptions of the - * supported annotation output. - */ - GSList *annotations; - - /** List of decoder options. */ - GSList *options; - - /** Python module. */ - PyObject *py_mod; - - /** sigrokdecode.Decoder class. */ - PyObject *py_dec; -}; - -/** - * Structure which contains information about one protocol decoder probe. - * For example, I2C has two probes, SDA and SCL. - */ -struct srd_probe { - /** The ID of the probe. Must be non-NULL. */ - char *id; - /** The name of the probe. Must not be NULL. */ - char *name; - /** The description of the probe. Must not be NULL. */ - char *desc; - /** The index of the probe, i.e. its order in the list of probes. */ - int order; -}; - -struct srd_decoder_option { - char *id; - char *desc; - GVariant *def; -}; - -struct srd_decoder_inst { - struct srd_decoder *decoder; - PyObject *py_inst; - char *inst_id; - GSList *pd_output; - int dec_num_probes; - int *dec_probemap; - int data_num_probes; - int data_unitsize; - uint64_t data_samplerate; - GSList *next_di; -}; - -struct srd_pd_output { - int pdo_id; - int output_type; - struct srd_decoder_inst *di; - char *proto_id; -}; - -struct srd_proto_data { - uint64_t start_sample; - uint64_t end_sample; - struct srd_pd_output *pdo; - int ann_format; - void *data; -}; - -typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata, - void *cb_data); - -struct srd_pd_callback { - int output_type; - srd_pd_output_callback_t cb; - void *cb_data; -}; - -/* Custom Python types: */ - -typedef struct { - PyObject_HEAD -} srd_Decoder; - -typedef struct { - PyObject_HEAD - struct srd_decoder_inst *di; - uint64_t start_samplenum; - unsigned int itercnt; - uint8_t *inbuf; - uint64_t inbuflen; - PyObject *sample; -} srd_logic; - -/*--- controller.c ----------------------------------------------------------*/ - -SRD_API int srd_init(const char *path); -SRD_API int srd_exit(void); -SRD_API int srd_inst_option_set(struct srd_decoder_inst *di, - GHashTable *options); -SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di, - GHashTable *probes); -SRD_API struct srd_decoder_inst *srd_inst_new(const char *id, - GHashTable *options); -SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from, - struct srd_decoder_inst *di_to); -SRD_API struct srd_decoder_inst *srd_inst_find_by_id(const char *inst_id); -SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate); -SRD_API int srd_session_send(uint64_t start_samplenum, const uint8_t *inbuf, - uint64_t inbuflen); -SRD_API int srd_pd_output_callback_add(int output_type, - srd_pd_output_callback_t cb, void *cb_data); - -/*--- decoder.c -------------------------------------------------------------*/ - -SRD_API const GSList *srd_decoder_list(void); -SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id); -SRD_API int srd_decoder_load(const char *name); -SRD_API int srd_decoder_unload(struct srd_decoder *dec); -SRD_API int srd_decoder_load_all(void); -SRD_API int srd_decoder_unload_all(void); -SRD_API char *srd_decoder_doc_get(const struct srd_decoder *dec); - -/*--- log.c -----------------------------------------------------------------*/ - -typedef int (*srd_log_callback_t)(void *cb_data, int loglevel, - const char *format, va_list args); - -SRD_API int srd_log_loglevel_set(int loglevel); -SRD_API int srd_log_loglevel_get(void); -SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data); -SRD_API int srd_log_callback_set_default(void); -SRD_API int srd_log_logdomain_set(const char *logdomain); -SRD_API char *srd_log_logdomain_get(void); - -/*--- version.c -------------------------------------------------------------*/ - -SRD_API int srd_package_version_major_get(void); -SRD_API int srd_package_version_minor_get(void); -SRD_API int srd_package_version_micro_get(void); -SRD_API const char *srd_package_version_string_get(void); - -SRD_API int srd_lib_version_current_get(void); -SRD_API int srd_lib_version_revision_get(void); -SRD_API int srd_lib_version_age_get(void); -SRD_API const char *srd_lib_version_string_get(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/type_decoder.c b/type_decoder.c index 1de3b0e..16675bc 100644 --- a/type_decoder.c +++ b/type_decoder.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include diff --git a/type_logic.c b/type_logic.c index 6f266aa..9f2b392 100644 --- a/type_logic.c +++ b/type_logic.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include "config.h" #include #include diff --git a/util.c b/util.c index aec73fa..74d56c3 100644 --- a/util.c +++ b/util.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" /** diff --git a/version.c b/version.c index 9449c2d..8fbbafa 100644 --- a/version.c +++ b/version.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "sigrokdecode.h" +#include "libsigrokdecode.h" /** * @file -- cgit v1.2.3-70-g09d2