summaryrefslogtreecommitdiff
path: root/decode.c
diff options
context:
space:
mode:
authorGareth McMullin <gareth@blacksphere.co.nz>2011-11-20 18:39:50 +1300
committerGareth McMullin <gareth@blacksphere.co.nz>2011-11-20 18:39:50 +1300
commitf97f531c2d31b729afbf1c97a0d017526bf8e52a (patch)
tree4ca0ecfef74be831ff3490db67986e15e08c32bb /decode.c
parent74911b4c1f6d184dac878d94992d480af0564734 (diff)
downloadlibsigrokdecode-f97f531c2d31b729afbf1c97a0d017526bf8e52a.tar.gz
libsigrokdecode-f97f531c2d31b729afbf1c97a0d017526bf8e52a.zip
libsigrokdecode: Allow frontend to configure decoder probes.
Diffstat (limited to 'decode.c')
-rw-r--r--decode.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/decode.c b/decode.c
index 398a9f7..396cde8 100644
--- a/decode.c
+++ b/decode.c
@@ -284,6 +284,8 @@ static int srd_load_decoder(const char *name,
struct srd_decoder_instance *srd_instance_new(const char *id)
{
struct srd_decoder *dec = srd_get_decoder_by_id(id);
+ if (!dec)
+ return NULL;
struct srd_decoder_instance *di = g_malloc(sizeof(*di));
PyObject *py_args, *py_value;
@@ -317,6 +319,26 @@ struct srd_decoder_instance *srd_instance_new(const char *id)
return di;
}
+int srd_instance_set_probe(struct srd_decoder_instance *di,
+ const char *probename, int num)
+{
+ PyObject *probedict, *probenum;
+ probedict = PyObject_GetAttrString(di->py_instance, "probes"); /* NEWREF */
+ if (!probedict) {
+ if (PyErr_Occurred())
+ PyErr_Print(); /* Returns void. */
+
+ return SRD_ERR_PYTHON; /* TODO: More specific error? */
+ }
+
+ probenum = PyInt_FromLong(num);
+ PyMapping_SetItemString(probedict, (char*)probename, probenum);
+
+ Py_XDECREF(probenum);
+ Py_XDECREF(probedict);
+ return SRD_OK;
+}
+
/**
* Run the specified decoder function.
*
@@ -333,7 +355,7 @@ int srd_run_decoder(struct srd_decoder_instance *dec,
uint8_t **outbuf, uint64_t *outbuflen)
{
PyObject *py_instance, *py_value, *py_res;
- int r, ret;
+ int ret;
/* FIXME: Don't have a timebase available here. Make one up. */
static int _timehack = 0;