struct srd_decoder: Add list of input/output decoder IDs.

diff --git a/decoder.c b/decoder.c
index 9990e2998e14bdfff730d05170f39e7c078fa277..9c57b1c337652840417de01829fc0c5d75654636 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -165,6 +165,8 @@ static void decoder_free(struct srd_decoder *dec)
        g_slist_free_full(dec->opt_channels, &channel_free);
        g_slist_free_full(dec->channels, &channel_free);
 
+       g_slist_free_full(dec->outputs, g_free);
+       g_slist_free_full(dec->inputs, g_free);
        g_free(dec->license);
        g_free(dec->desc);
        g_free(dec->longname);
@@ -727,6 +729,16 @@ SRD_API int srd_decoder_load(const char *module_name)
                goto err_out;
        }
 
+       if (py_attr_as_strlist(d->py_dec, "inputs", &(d->inputs)) != SRD_OK) {
+               fail_txt = "missing or malformed 'inputs' attribute";
+               goto err_out;
+       }
+
+       if (py_attr_as_strlist(d->py_dec, "outputs", &(d->outputs)) != SRD_OK) {
+               fail_txt = "missing or malformed 'outputs' attribute";
+               goto err_out;
+       }
+
        /* All options and their default values. */
        if (get_options(d) != SRD_OK) {
                fail_txt = "cannot get options";

diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index c12b877701d750942060de523229ecd0fff29e8f..eb792870b8f0e329b778236c8696286e5c293e5c 100644 (file)
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -120,7 +120,9 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void);
 /* util.c */
 SRD_PRIV PyObject *py_import_by_name(const char *name);
 SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr);
+SRD_PRIV int py_attr_as_strlist(PyObject *py_obj, const char *attr, GSList **outstrlist);
 SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr);
+SRD_PRIV int py_listitem_as_str(PyObject *py_obj, Py_ssize_t idx, char **outstr);
 SRD_PRIV int py_pydictitem_as_str(PyObject *py_obj, PyObject *py_key, char **outstr);
 SRD_PRIV int py_pydictitem_as_long(PyObject *py_obj, PyObject *py_key, uint64_t *out);
 SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr);

diff --git a/libsigrokdecode.h b/libsigrokdecode.h
index ae96d950e5f009f79bb4dd7d845ceb5e4faa0dea..df1cb5c481192d95fbfe5fb9e491ee3e81965291 100644 (file)
--- a/libsigrokdecode.h
+++ b/libsigrokdecode.h
@@ -154,6 +154,12 @@ struct srd_decoder {
         */
        char *license;
 
+       /** List of possible decoder input IDs. */
+       GSList *inputs;
+
+       /** List of possible decoder output IDs. */
+       GSList *outputs;
+
        /** List of channels required by this decoder. */
        GSList *channels;
 

diff --git a/util.c b/util.c
index bb353d0a694ba072cd61ac8025ea9bddddd4896e..9a573ccd29e3ef68bc0fac2034fa188d05ef42f8 100644 (file)
--- a/util.c
+++ b/util.c
@@ -81,6 +81,58 @@ SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
        return ret;
 }
 
+/**
+ * Get the value of a Python object's attribute, returned as a newly
+ * allocated GSList of char *.
+ *
+ * @param[in] py_obj The object to probe.
+ * @param[in] attr Name of the attribute to retrieve.
+ * @param[out] outstrlist ptr to GSList of char * storage to be filled in.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ *         The 'outstrlist' argument points to a GSList of g_malloc()ed strings
+ *         upon success.
+ *
+ * @private
+ */
+SRD_PRIV int py_attr_as_strlist(PyObject *py_obj, const char *attr, GSList **outstrlist)
+{
+       PyObject *py_list;
+       Py_ssize_t i;
+       int ret;
+       char *outstr;
+
+       if (!PyObject_HasAttrString(py_obj, attr)) {
+               srd_dbg("Object has no attribute '%s'.", attr);
+               return SRD_ERR_PYTHON;
+       }
+
+       if (!(py_list = PyObject_GetAttrString(py_obj, attr))) {
+               srd_exception_catch("Failed to get attribute '%s'", attr);
+               return SRD_ERR_PYTHON;
+       }
+
+       if (!PyList_Check(py_list)) {
+               srd_dbg("Object is not a list.");
+               return SRD_ERR_PYTHON;
+       }
+
+       *outstrlist = NULL;
+
+       for (i = 0; i < PyList_Size(py_list); i++) {
+               ret = py_listitem_as_str(py_list, i, &outstr);
+               if (ret < 0) {
+                       srd_dbg("Couldn't get item %" PY_FORMAT_SIZE_T "d.", i);
+                       return SRD_ERR_PYTHON;
+               }
+               *outstrlist = g_slist_append(*outstrlist, outstr);
+       }
+
+       Py_DECREF(py_list);
+
+       return SRD_OK;
+}
+
 /**
  * Get the value of a Python dictionary item, returned as a newly
  * allocated char *.
@@ -112,6 +164,37 @@ SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
        return py_str_as_str(py_value, outstr);
 }
 
+/**
+ * Get the value of a Python list item, returned as a newly
+ * allocated char *.
+ *
+ * @param[in] py_obj The list to probe.
+ * @param[in] idx Index of the list item to retrieve.
+ * @param[out] outstr Pointer to char * storage to be filled in.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ *         The 'outstr' argument points to a g_malloc()ed string upon success.
+ *
+ * @private
+ */
+SRD_PRIV int py_listitem_as_str(PyObject *py_obj, Py_ssize_t idx,
+                               char **outstr)
+{
+       PyObject *py_value;
+
+       if (!PyList_Check(py_obj)) {
+               srd_dbg("Object is not a list.");
+               return SRD_ERR_PYTHON;
+       }
+
+       if (!(py_value = PyList_GetItem(py_obj, idx))) {
+               srd_dbg("Couldn't get list item %" PY_FORMAT_SIZE_T "d.", idx);
+               return SRD_ERR_PYTHON;
+       }
+
+       return py_str_as_str(py_value, outstr);
+}
+
 /**
  * Get the value of a Python dictionary item, returned as a newly
  * allocated char *.