summaryrefslogtreecommitdiff
path: root/decode.c
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2011-01-15 01:44:41 +0100
committerUwe Hermann <uwe@hermann-uwe.de>2011-01-15 02:20:04 +0100
commit7c24d086f1c81fd23fd93e5702c6f46a36f3d3f6 (patch)
treea3ce527aa132c98e384622d978411dac7d9d30ab /decode.c
parent9c93add5aeca95c568afab7fe249c0586d8dec6b (diff)
downloadlibsigrokdecode-7c24d086f1c81fd23fd93e5702c6f46a36f3d3f6.tar.gz
libsigrokdecode-7c24d086f1c81fd23fd93e5702c6f46a36f3d3f6.zip
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.
Diffstat (limited to 'decode.c')
-rw-r--r--decode.c22
1 files changed, 20 insertions, 2 deletions
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;
}