Add a new -A | --list-protocol-decoders option to show the list of
protocol decoders we could find.
Add -a | --protocol-decoders to specify a list of decoders that shall
be applied to the datastream. Currently only works for one decoder.
Define DECODERS_DIR, which is the directory where the decoders will be
installed upon 'make install', and where libsigrokdecode_init() will
search for them.
Thanks Olivier Fauchon <redacted> for the initial patch,
merged in slightly different form.
libsigrokdecode_la_SOURCES = decode.c
libsigrokdecode_la_SOURCES = decode.c
-libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON)
+libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
+ -DDECODERS_DIR='"$(DECODERS_DIR)"'
libsigrokdecode_la_LDFLAGS = $(LDFLAGS_PYTHON)
include_HEADERS = sigrokdecode.h
libsigrokdecode_la_LDFLAGS = $(LDFLAGS_PYTHON)
include_HEADERS = sigrokdecode.h
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <stdio.h>
#include <string.h>
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <stdio.h>
#include <string.h>
/* Re-define some string functions for Python >= 3.0. */
#if PY_VERSION_HEX >= 0x03000000
/* Re-define some string functions for Python >= 3.0. */
#if PY_VERSION_HEX >= 0x03000000
#define PyString_Check PyBytes_Check
#endif
#define PyString_Check PyBytes_Check
#endif
+/* The list of protocol decoders. */
+GSList *list_pds;
+
/**
* Initialize libsigrokdecode.
*
/**
* Initialize libsigrokdecode.
*
*/
int sigrokdecode_init(void)
{
*/
int sigrokdecode_init(void)
{
+ DIR *dir;
+ struct dirent *dp;
+ char *tmp;
+
/* Py_Initialize() returns void and usually cannot fail. */
Py_Initialize();
/* Py_Initialize() returns void and usually cannot fail. */
Py_Initialize();
PyRun_SimpleString(
"import sys;"
"sys.path.append('libsigrokdecode/decoders');"
PyRun_SimpleString(
"import sys;"
"sys.path.append('libsigrokdecode/decoders');"
- "sys.path.append('../libsigrokdecode/decoders');"
- "sys.path.append('/usr/local/share/sigrok');"
+ "sys.path.append('" DECODERS_DIR "');"
+ if (!(dir = opendir(DECODERS_DIR)))
+ return SIGROKDECODE_ERR_DECODERS_DIR;
+
+ while ((dp = readdir(dir)) != NULL) {
+ if (!strstr(dp->d_name, ".py"))
+ continue;
+ if ((tmp = strdup(dp->d_name)))
+ list_pds = g_slist_append(list_pds, tmp);
+ }
+ closedir(dir);
+
return SIGROKDECODE_OK;
}
return SIGROKDECODE_OK;
}
#define SIGROKDECODE_ERR_MALLOC -2 /* Malloc/calloc/realloc error */
#define SIGROKDECODE_ERR_ARGS -3 /* Function argument error */
#define SIGROKDECODE_ERR_PYTHON -4 /* Python C API error */
#define SIGROKDECODE_ERR_MALLOC -2 /* Malloc/calloc/realloc error */
#define SIGROKDECODE_ERR_ARGS -3 /* Function argument error */
#define SIGROKDECODE_ERR_PYTHON -4 /* Python C API error */
+#define SIGROKDECODE_ERR_DECODERS_DIR -5 /* Protocol decoder path invalid */
+
+/* The list of loaded protocol decoders. */
+GSList *list_pds;
/* TODO: Documentation. */
struct sigrokdecode_decoder {
/* TODO: Documentation. */
struct sigrokdecode_decoder {