decoder onewire: some annotation cleanup

[libsigrokdecode.git] / type_decoder.c

diff --git a/type_decoder.c b/type_decoder.c
index 5190cc6de3d9ec3b771e6d2fb3c7080c3992c847..9cf77708dee62982fe6117db67f15afaab1767aa 100644 (file)
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -23,7 +23,7 @@
 #include <inttypes.h>
 
 /* This is only used for nicer srd_dbg() output. */
-char *OUTPUT_TYPES[] = {
+static const char *OUTPUT_TYPES[] = {
        "OUTPUT_ANN",
        "OUTPUT_PROTO",
        "OUTPUT_BINARY",
@@ -36,14 +36,14 @@ static int convert_pyobj(struct srd_decoder_inst *di, PyObject *obj,
        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_inst *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 "
@@ -135,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) {
@@ -148,7 +148,7 @@ 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? */
+                       /* TODO: Is this needed? */
                        Py_XINCREF(next_di->py_inst);
                        srd_spew("Sending %d-%d to instance %s",
                                 start_sample, end_sample,
@@ -156,8 +156,8 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
                        if (!(py_res = PyObject_CallMethod(
                            next_di->py_inst, "decode", "KKO", start_sample,
                            end_sample, data))) {
-                               catch_exception("calling %s decode(): ",
-                                               next_di->inst_id);
+                               srd_exception_catch("Calling %s decode(): ",
+                                                   next_di->inst_id);
                        }
                        Py_XDECREF(py_res);
                }
@@ -193,7 +193,7 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args)
                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
@@ -214,6 +214,6 @@ SRD_PRIV PyTypeObject srd_Decoder_type = {
        .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,
 };