From 7c24d086f1c81fd23fd93e5702c6f46a36f3d3f6 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sat, 15 Jan 2011 01:44:41 +0100
Subject: CLI: Support for running protocol decoders.
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 <olivier@aixmarseille.com> for the initial patch,
merged in slightly different form.
---
Makefile.am | 3 ++-
decode.c | 22 ++++++++++++++++++++--
sigrokdecode.h | 4 ++++
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c76c5c4..6ae808f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ lib_LTLIBRARIES = libsigrokdecode.la
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
diff --git a/decode.c b/decode.c
index 337979d..536be2c 100644
--- a/decode.c
+++ b/decode.c
@@ -21,6 +21,7 @@
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <stdio.h>
#include <string.h>
+#include <dirent.h>
/* Re-define some string functions for Python >= 3.0. */
#if PY_VERSION_HEX >= 0x03000000
@@ -29,6 +30,9 @@
#define PyString_Check PyBytes_Check
#endif
+/* The list of protocol decoders. */
+GSList *list_pds;
+
/**
* Initialize libsigrokdecode.
*
@@ -36,6 +40,10 @@
*/
int sigrokdecode_init(void)
{
+ DIR *dir;
+ struct dirent *dp;
+ char *tmp;
+
/* Py_Initialize() returns void and usually cannot fail. */
Py_Initialize();
@@ -45,10 +53,20 @@ int sigrokdecode_init(void)
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;
}
diff --git a/sigrokdecode.h b/sigrokdecode.h
index 5112e09..ecd141a 100644
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -47,6 +47,10 @@
#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 {
--
cgit v1.2.3-70-g09d2