diff options
| -rw-r--r-- | decoder.c | 12 | ||||
| -rw-r--r-- | libsigrokdecode-internal.h | 2 | ||||
| -rw-r--r-- | libsigrokdecode.h | 6 | ||||
| -rw-r--r-- | util.c | 83 |
4 files changed, 103 insertions, 0 deletions
@@ -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 c12b877..eb79287 100644 --- 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 ae96d95..df1cb5c 100644 --- 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; @@ -82,6 +82,58 @@ SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr) } /** + * 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 *. * @@ -113,6 +165,37 @@ SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, } /** + * 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 *. * |