diff options
| -rw-r--r-- | decode.c | 69 | ||||
| -rw-r--r-- | decoders/spi.py | 1 | ||||
| -rw-r--r-- | sigrokdecode.h | 7 |
3 files changed, 38 insertions, 39 deletions
@@ -61,8 +61,9 @@ emb_put(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "O:put", &arg)) return NULL; - fprintf(stderr, "sigrok.put() called by decoder:\n"); + fprintf(stdout, "sigrok.put() called by decoder:\n"); PyObject_Print(arg, stdout, Py_PRINT_RAW); + puts(""); Py_RETURN_NONE; } @@ -218,7 +219,6 @@ static int srd_load_decoder(const char *name, { struct srd_decoder *d; PyObject *py_mod, *py_res; - PyObject *py_args, *py_value, *py_instance; int r; fprintf(stdout, "%s: %s\n", __func__, name); @@ -270,15 +270,29 @@ static int srd_load_decoder(const char *name, d->py_mod = py_mod; d->py_decobj = py_res; + /* TODO: Handle func, inputformats, outputformats. */ + /* Note: They must at least be set to NULL, will segfault otherwise. */ + d->func = NULL; + d->inputformats = NULL; + d->outputformats = NULL; + + *dec = d; + + return SRD_OK; +} + +struct srd_decoder_instance *srd_instance_new(const char *id) +{ + struct srd_decoder *dec = srd_get_decoder_by_id(id); + struct srd_decoder_instance *di = g_malloc(sizeof(*di)); + PyObject *py_args, *py_value; + /* Create a Python tuple of size 1. */ if (!(py_args = PyTuple_New(0))) { /* NEWREF */ if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ - Py_XDECREF(py_res); - Py_XDECREF(py_mod); - - return SRD_ERR_PYTHON; /* TODO: More specific error? */ + return NULL; /* TODO: More specific error? */ } py_value = Py_BuildValue("{sssisd}", @@ -286,28 +300,21 @@ static int srd_load_decoder(const char *name, "unitsize", _unitsize, //FIXME: Pass in a unitsize that matches the selected LA "starttime", 129318231823.0 //TODO: Fill with something reasonable. ); + /* Create an instance of the Decoder class */ - py_instance = PyObject_Call(py_res, py_args, py_value); - if (!py_instance) { + di->py_instance = PyObject_Call(dec->py_decobj, py_args, py_value); + if (!di->py_instance) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ + Py_XDECREF(py_args); Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ - Py_XDECREF(py_res); - Py_XDECREF(py_mod); - fprintf(stderr, "Unable to create instance of Decoder class in PD module %s\n", name); - return SRD_ERR_PYTHON; /* TODO: More specific error? */ + return NULL; /* TODO: More specific error? */ } - d->py_instance = py_instance; - /* TODO: Handle func, inputformats, outputformats. */ - /* Note: They must at least be set to NULL, will segfault otherwise. */ - d->func = NULL; - d->inputformats = NULL; - d->outputformats = NULL; - - *dec = d; + Py_XDECREF(py_args); + Py_XDECREF(py_value); - return SRD_OK; + return di; } /** @@ -321,11 +328,11 @@ static int srd_load_decoder(const char *name, * * @return SRD_OK upon success, a (negative) error code otherwise. */ -int srd_run_decoder(struct srd_decoder *dec, +int srd_run_decoder(struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen, uint8_t **outbuf, uint64_t *outbuflen) { - PyObject *py_mod, *py_instance, *py_args, *py_value, *py_res; + PyObject *py_instance, *py_value, *py_res; int r, ret; /* FIXME: Don't have a timebase available here. Make one up. */ @@ -347,17 +354,9 @@ int srd_run_decoder(struct srd_decoder *dec, return SRD_ERR_ARGS; /* TODO: More specific error? */ /* TODO: Error handling. */ - py_mod = dec->py_mod; - Py_XINCREF(py_mod); py_instance = dec->py_instance; Py_XINCREF(py_instance); - /* Create a Python tuple of size 1. */ - if (!(py_args = PyTuple_New(1))) { /* NEWREF */ - ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ - goto err_run_decref_func; - } - /* Get the input buffer as Python "string" (byte array). */ /* TODO: int vs. uint64_t for 'inbuflen'? */ @@ -377,12 +376,8 @@ int srd_run_decoder(struct srd_decoder *dec, ret = SRD_OK; Py_XDECREF(py_res); - err_run_decref_args: - Py_XDECREF(py_args); -err_run_decref_func: - Py_XDECREF(py_instance); - Py_XDECREF(py_mod); + Py_XDECREF(py_value); if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ @@ -407,7 +402,7 @@ static int srd_unload_decoder(struct srd_decoder *dec) if (dec->outputformats != NULL) g_slist_free(dec->outputformats); - Py_XDECREF(dec->py_instance); + Py_XDECREF(dec->py_decobj); Py_XDECREF(dec->py_mod); return SRD_OK; diff --git a/decoders/spi.py b/decoders/spi.py index 997119c..0b688c8 100644 --- a/decoders/spi.py +++ b/decoders/spi.py @@ -86,7 +86,6 @@ class Decoder(): "display":("%02X" % self.rxdata), "type":"spi", } - print outdata sigrok.put(outdata) # Reset decoder state self.rxdata = 0 diff --git a/sigrokdecode.h b/sigrokdecode.h index 9f79252..76b53f5 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -93,14 +93,19 @@ struct srd_decoder { /** Python object that performs the decoding */ PyObject *py_decobj; +}; + +struct srd_decoder_instance { PyObject *py_instance; }; int srd_init(void); GSList *srd_list_decoders(void); struct srd_decoder *srd_get_decoder_by_id(const char *id); -int srd_run_decoder(struct srd_decoder *dec, uint8_t *inbuf, uint64_t inbuflen, +int srd_run_decoder(struct srd_decoder_instance *dec, + uint8_t *inbuf, uint64_t inbuflen, uint8_t **outbuf, uint64_t *outbuflen); +struct srd_decoder_instance *srd_instance_new(const char *id); int srd_exit(void); #ifdef __cplusplus |