X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decode.c;h=3a1f63da64147f47b2f86e81b8edf4889e12e9a5;hp=337979dee0e1bc411e73fbb1198af65dfab57cb2;hb=5b05904dc5dd1182fdf381b66fbc4a7ad97e37aa;hpb=9c93add5aeca95c568afab7fe249c0586d8dec6b diff --git a/decode.c b/decode.c index 337979d..3a1f63d 100644 --- a/decode.c +++ b/decode.c @@ -21,6 +21,7 @@ #include /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include #include +#include /* 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 = NULL; + /** * 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,13 +53,36 @@ 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 (!g_str_has_suffix(dp->d_name, ".py")) + continue; + /* For now use the filename (without .py) as decoder name. */ + if ((tmp = g_strndup(dp->d_name, strlen(dp->d_name) - 3))) + list_pds = g_slist_append(list_pds, tmp); + } + closedir(dir); + return SIGROKDECODE_OK; } +/** + * Returns the list of supported/loaded protocol decoders. + * + * This is a GSList containing the names of the decoders as strings. + * + * @return List of decoders, NULL if none are supported or loaded. + */ +GSList *sigrokdecode_list_decoders(void) +{ + return list_pds; +} + /** * Helper function to handle Python strings. *