X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=16675bcb9f0a136560d15c1cb70ddba91a5e3daf;hp=39ea3b79684f5b47bbb53f4044a7544b198c212b;hb=c1f86f02a149f46609273e1bd5b42696d544727a;hpb=c9bfccc6347e05e6faba6f27fe0e50a7d55f531c diff --git a/type_decoder.c b/type_decoder.c index 39ea3b7..16675bc 100644 --- a/type_decoder.c +++ b/type_decoder.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrokdecode project. * * Copyright (C) 2012 Bert Vermeulen * @@ -17,33 +17,33 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include /* This is only used for nicer srd_dbg() output. */ -char *OUTPUT_TYPES[] = { +static const char *OUTPUT_TYPES[] = { "OUTPUT_ANN", "OUTPUT_PROTO", "OUTPUT_BINARY", }; -static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj, +static int convert_pyobj(struct srd_decoder_inst *di, PyObject *obj, int *ann_format, char ***ann) { PyObject *py_tmp; struct srd_pd_output *pdo; int ann_id; - /* Should be a list of [annotation format, [string, ...]] */ + /* Should be a list of [annotation format, [string, ...]]. */ if (!PyList_Check(obj) && !PyTuple_Check(obj)) { srd_err("Protocol decoder %s submitted %s instead of list.", di->decoder->name, obj->ob_type->tp_name); return SRD_ERR_PYTHON; } - /* Should have 2 elements... */ + /* Should have 2 elements. */ if (PyList_Size(obj) != 2) { srd_err("Protocol decoder %s submitted annotation list with " "%d elements instead of 2", di->decoder->name, @@ -70,7 +70,7 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj, } *ann_format = ann_id; - /* Second element must be a list */ + /* Second element must be a list. */ py_tmp = PyList_GetItem(obj, 1); if (!PyList_Check(py_tmp)) { srd_err("Protocol decoder %s submitted annotation list, but " @@ -90,14 +90,14 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) { GSList *l; PyObject *data, *py_res; - struct srd_decoder_instance *di, *next_di; + struct srd_decoder_inst *di, *next_di; struct srd_pd_output *pdo; struct srd_proto_data *pdata; uint64_t start_sample, end_sample; int output_id; void (*cb)(); - if (!(di = srd_instance_find_by_obj(NULL, self))) { + if (!(di = srd_inst_find_by_obj(NULL, self))) { /* Shouldn't happen. */ srd_dbg("put(): self instance not found."); return NULL; @@ -121,11 +121,13 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) pdo = l->data; srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s on oid %d.", - di->instance_id, start_sample, end_sample, + di->inst_id, start_sample, end_sample, OUTPUT_TYPES[pdo->output_type], output_id); - if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data)))) + if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data)))) { + srd_err("Failed to g_malloc() struct srd_proto_data."); return NULL; + } pdata->start_sample = start_sample; pdata->end_sample = end_sample; pdata->pdo = pdo; @@ -133,7 +135,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) switch (pdo->output_type) { case SRD_OUTPUT_ANN: /* Annotations are only fed to callbacks. */ - if ((cb = srd_find_callback(pdo->output_type))) { + if ((cb = srd_pd_output_callback_find(pdo->output_type))) { /* Annotations need converting from PyObject. */ if (convert_pyobj(di, data, &pdata->ann_format, (char ***)&pdata->data) != SRD_OK) { @@ -146,16 +148,16 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) case SRD_OUTPUT_PROTO: for (l = di->next_di; l; l = l->next) { next_di = l->data; - /* TODO: is this needed? */ - Py_XINCREF(next_di->py_instance); + /* TODO: Is this needed? */ + Py_XINCREF(next_di->py_inst); srd_spew("Sending %d-%d to instance %s", start_sample, end_sample, - next_di->instance_id); + next_di->inst_id); if (!(py_res = PyObject_CallMethod( - next_di->py_instance, "decode", "KKO", start_sample, + next_di->py_inst, "decode", "KKO", start_sample, end_sample, data))) { - catch_exception("calling %s decode(): ", - next_di->instance_id); + srd_exception_catch("Calling %s decode(): ", + next_di->inst_id); } Py_XDECREF(py_res); } @@ -177,21 +179,21 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) static PyObject *Decoder_add(PyObject *self, PyObject *args) { PyObject *ret; - struct srd_decoder_instance *di; + struct srd_decoder_inst *di; char *proto_id; int output_type, pdo_id; - if (!(di = srd_instance_find_by_obj(NULL, self))) { + if (!(di = srd_inst_find_by_obj(NULL, self))) { PyErr_SetString(PyExc_Exception, "decoder instance not found"); return NULL; } if (!PyArg_ParseTuple(args, "is", &output_type, &proto_id)) { - /* Let python raise this exception. */ + /* Let Python raise this exception. */ return NULL; } - pdo_id = pd_add(di, output_type, proto_id); + pdo_id = srd_inst_pd_output_add(di, output_type, proto_id); if (pdo_id < 0) Py_RETURN_NONE; else @@ -207,11 +209,13 @@ static PyMethodDef Decoder_methods[] = { {NULL, NULL, 0, NULL} }; -PyTypeObject srd_Decoder_type = { +/** @cond PRIVATE */ +SRD_PRIV PyTypeObject srd_Decoder_type = { PyVarObject_HEAD_INIT(NULL, 0) .tp_name = "sigrokdecode.Decoder", .tp_basicsize = sizeof(srd_Decoder), .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, - .tp_doc = "Sigrok Decoder base class", + .tp_doc = "sigrok Decoder base class", .tp_methods = Decoder_methods, }; +/** @endcond */