diff options
| -rw-r--r-- | decode.c | 68 | ||||
| -rw-r--r-- | decoders/i2c.py | 10 | ||||
| -rw-r--r-- | decoders/spi.py | 9 | ||||
| -rw-r--r-- | decoders/transitioncounter.py | 9 | ||||
| -rw-r--r-- | sigrokdecode.h | 2 |
5 files changed, 46 insertions, 52 deletions
@@ -49,8 +49,6 @@ static GSList *list_pds = NULL; static int srd_load_decoder(const char *name, struct srd_decoder **dec); -static int _unitsize = 1; - static PyObject *emb_put(PyObject *self, PyObject *args) { PyObject *arg; @@ -314,7 +312,7 @@ struct srd_decoder_instance *srd_instance_new(const char *id) { struct srd_decoder *dec; struct srd_decoder_instance *di; - PyObject *py_args, *py_value; + PyObject *py_args; if (!(dec = srd_get_decoder_by_id(id))) return NULL; @@ -330,27 +328,16 @@ struct srd_decoder_instance *srd_instance_new(const char *id) return NULL; /* TODO: More specific error? */ } - /* - * FIXME: Pass in a unitsize that matches the selected LA. - * FIXME: Fill 'starttime' with something reasonable. - */ - py_value = Py_BuildValue("{sssisd}", - "driver", "demo", - "unitsize", _unitsize, - "starttime", 129318231823.0); - /* Create an instance of the 'Decoder' class. */ - di->py_instance = PyObject_Call(dec->py_decobj, py_args, py_value); + di->py_instance = PyObject_Call(dec->py_decobj, py_args, NULL); if (!di->py_instance) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ Py_XDECREF(py_args); - Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ return NULL; /* TODO: More specific error? */ } Py_XDECREF(py_args); - Py_XDECREF(py_value); return di; } @@ -377,6 +364,25 @@ int srd_instance_set_probe(struct srd_decoder_instance *di, return SRD_OK; } +int srd_instance_start(struct srd_decoder_instance *di, + const char *driver, int unitsize, uint64_t starttime) +{ + PyObject *py_res; + + if (!(py_res = PyObject_CallMethod(di->py_instance, "start", + "{s:s,s:i,s:d}", + "driver", driver, + "unitsize", unitsize, + "starttime", starttime))) { + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } + Py_XDECREF(py_res); + return SRD_OK; +} + /** * Run the specified decoder function. * @@ -392,8 +398,7 @@ int srd_run_decoder(struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen, uint8_t **outbuf, uint64_t *outbuflen) { - PyObject *py_instance, *py_value, *py_res; - int ret; + PyObject *py_instance, *py_res; /* FIXME: Don't have a timebase available here. Make one up. */ static int _timehack = 0; @@ -417,30 +422,19 @@ int srd_run_decoder(struct srd_decoder_instance *dec, py_instance = dec->py_instance; Py_XINCREF(py_instance); - /* Get the input buffer as Python "string" (byte array). */ - /* TODO: int vs. uint64_t for 'inbuflen'? */ - - py_value = Py_BuildValue("{sisiss#}", - "time", _timehack, - "duration", 10, - "data", inbuf, inbuflen / _unitsize); - if (!(py_res = PyObject_CallMethod(py_instance, "decode", - "O", py_value))) { /* NEWREF */ - ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ - goto err_run_decref_args; - } + "{s:i,s:i,s:s#}", + "time", _timehack, + "duration", 10, + "data", inbuf, inbuflen))) { /* NEWREF */ + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ - ret = SRD_OK; + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } Py_XDECREF(py_res); -err_run_decref_args: - Py_XDECREF(py_value); - - if (PyErr_Occurred()) - PyErr_Print(); /* Returns void. */ - - return ret; + return SRD_OK; } /** diff --git a/decoders/i2c.py b/decoders/i2c.py index a46ba6a..f0b32e7 100644 --- a/decoders/i2c.py +++ b/decoders/i2c.py @@ -154,11 +154,7 @@ class Decoder(): 'address-space': ['Address space (in bits)', 7], } - def __init__(self, unitsize, **kwargs): - # Metadata comes in here, we don't care for now. - # print kwargs - self.unitsize = unitsize - + def __init__(self, **kwargs): self.probes = Decoder.probes.copy() # TODO: Don't hardcode the number of channels. @@ -180,6 +176,10 @@ class Decoder(): self.oldscl = None self.oldsda = None + def start(self, metadata): + self.unitsize = metadata["unitsize"] + + def report(self): pass diff --git a/decoders/spi.py b/decoders/spi.py index 7b3d8ab..731c77c 100644 --- a/decoders/spi.py +++ b/decoders/spi.py @@ -43,17 +43,16 @@ class Decoder(): probes = {'sdata':0, 'sck':1} options = {} - def __init__(self, unitsize, **kwargs): - # Metadata comes in here, we don't care for now - #print kwargs - self.unitsize = unitsize - + def __init__(self): self.probes = Decoder.probes.copy() self.oldsck = True self.rxcount = 0 self.rxdata = 0 self.bytesreceived = 0 + def start(self, metadata): + self.unitsize = metadata["unitsize"] + def report(self): return "SPI: %d bytes received" % self.bytesreceived diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py index 1b10518..f401b15 100644 --- a/decoders/transitioncounter.py +++ b/decoders/transitioncounter.py @@ -42,11 +42,7 @@ class Decoder(): probes = {} options = {} - def __init__(self, unitsize, **kwargs): - # Metadata comes in here, we don't care for now. - # print kwargs - self.unitsize = unitsize - + def __init__(self, **kwargs): self.probes = Decoder.probes.copy() # TODO: Don't hardcode the number of channels. @@ -58,6 +54,9 @@ class Decoder(): self.rising = [0] * self.channels self.falling = [0] * self.channels + def start(self, metadata): + self.unitsize = metadata["unitsize"] + def report(self): pass diff --git a/sigrokdecode.h b/sigrokdecode.h index dabfd33..abc3baa 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -108,6 +108,8 @@ int srd_run_decoder(struct srd_decoder_instance *dec, struct srd_decoder_instance *srd_instance_new(const char *id); int srd_instance_set_probe(struct srd_decoder_instance *di, const char *probename, int num); +int srd_instance_start(struct srd_decoder_instance *di, + const char *driver, int unitsize, uint64_t starttime); int srd_exit(void); #ifdef __cplusplus |