move srd_Decoder to sigrokdecode.h, and rename it in line with srd_logic
[libsigrokdecode.git] / module_sigrokdecode.c
index 720bfd3a99975f316c829f74fd9c9760e6fbe261..a18583bb5ea9b6ae33ebd1e17804f1f046540a15 100644 (file)
@@ -26,7 +26,7 @@ extern PyTypeObject srd_logic_type;
 
 
 static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
 
 
 static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
-               int *annotation_format, char ***annotation)
+               int *ann_format, char ***ann)
 {
        PyObject *py_tmp;
        struct srd_pd_output *pdo;
 {
        PyObject *py_tmp;
        struct srd_pd_output *pdo;
@@ -56,12 +56,12 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
        }
 
        ann_id = PyLong_AsLong(py_tmp);
        }
 
        ann_id = PyLong_AsLong(py_tmp);
-       if (!(pdo = g_slist_nth_data(di->decoder->annotation, ann_id))) {
+       if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_id))) {
                srd_err("Protocol decoder %s submitted data to non-existent annotation format %d",
                                di->decoder->name, ann_id);
                return SRD_ERR_PYTHON;
        }
                srd_err("Protocol decoder %s submitted data to non-existent annotation format %d",
                                di->decoder->name, ann_id);
                return SRD_ERR_PYTHON;
        }
-       *annotation_format = ann_id;
+       *ann_format = ann_id;
 
        /* Second element must be a list */
        py_tmp = PyList_GetItem(obj, 1);
 
        /* Second element must be a list */
        py_tmp = PyList_GetItem(obj, 1);
@@ -70,7 +70,7 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
                                di->decoder->name);
                return SRD_ERR_PYTHON;
        }
                                di->decoder->name);
                return SRD_ERR_PYTHON;
        }
-       if (py_strlist_to_char(py_tmp, annotation) != SRD_OK) {
+       if (py_strlist_to_char(py_tmp, ann) != SRD_OK) {
                srd_err("Protocol decoder %s submitted annotation list, but second element was malformed",
                                di->decoder->name);
                return SRD_ERR_PYTHON;
                srd_err("Protocol decoder %s submitted annotation list, but second element was malformed",
                                di->decoder->name);
                return SRD_ERR_PYTHON;
@@ -82,10 +82,10 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
 static PyObject *Decoder_put(PyObject *self, PyObject *args)
 {
        GSList *l;
 static PyObject *Decoder_put(PyObject *self, PyObject *args)
 {
        GSList *l;
-       PyObject *data;
-       struct srd_decoder_instance *di;
+       PyObject *data, *py_res;
+       struct srd_decoder_instance *di, *next_di;
        struct srd_pd_output *pdo;
        struct srd_pd_output *pdo;
-       struct srd_protocol_data *pdata;
+       struct srd_proto_data *pdata;
        uint64_t start_sample, end_sample;
        int output_id;
        void (*cb)();
        uint64_t start_sample, end_sample;
        int output_id;
        void (*cb)();
@@ -103,36 +103,48 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
        }
        pdo = l->data;
 
        }
        pdo = l->data;
 
+       if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data))))
+               return NULL;
+       pdata->start_sample = start_sample;
+       pdata->end_sample = end_sample;
+       pdata->pdo = pdo;
+
        switch (pdo->output_type) {
        switch (pdo->output_type) {
-       case SRD_OUTPUT_ANNOTATION:
-       case SRD_OUTPUT_PROTOCOL:
+       case SRD_OUTPUT_ANN:
+               /* Annotations are only fed to callbacks. */
+               if ((cb = srd_find_callback(pdo->output_type))) {
+                       /* Annotations need converting from PyObject. */
+                       if (convert_pyobj(di, data, &pdata->ann_format,
+                                       (char ***)&pdata->data) != SRD_OK) {
+                               /* An error was already logged. */
+                               break;
+                       }
+                       cb(pdata);
+               }
+               break;
+       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);
+                       if (!(py_res = PyObject_CallMethod(next_di->py_instance, "decode",
+                                       "KKO", start_sample, end_sample, data))) {
+                               if (PyErr_Occurred())
+                                       PyErr_Print();
+                       }
+                       Py_XDECREF(py_res);
+               }
+               break;
        case SRD_OUTPUT_BINARY:
        case SRD_OUTPUT_BINARY:
+               srd_err("SRD_OUTPUT_BINARY not yet supported");
                break;
        default:
                srd_err("Protocol decoder %s submitted invalid output type %d",
                                di->decoder->name, pdo->output_type);
                break;
        default:
                srd_err("Protocol decoder %s submitted invalid output type %d",
                                di->decoder->name, pdo->output_type);
-               return NULL;
                break;
        }
 
                break;
        }
 
-       if ((cb = srd_find_callback(pdo->output_type))) {
-               /* Something registered an interest in this output type. */
-               if (!(pdata = g_try_malloc0(sizeof(struct srd_protocol_data))))
-                       return NULL;
-               pdata->start_sample = start_sample;
-               pdata->end_sample = end_sample;
-               pdata->pdo = pdo;
-               if (pdo->output_type == SRD_OUTPUT_ANNOTATION) {
-                       /* annotations need converting from PyObject */
-                       if (convert_pyobj(di, data, &pdata->annotation_format,
-                                       (char ***)&pdata->data) != SRD_OK)
-                               return NULL;
-               } else {
-                       /* annotation_format is unused, data is an opaque blob. */
-                       pdata->data = data;
-               }
-               cb(pdata);
-       }
+       g_free(pdata);
 
        Py_RETURN_NONE;
 }
 
        Py_RETURN_NONE;
 }
@@ -142,16 +154,22 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args)
 {
        PyObject *ret;
        struct srd_decoder_instance *di;
 {
        PyObject *ret;
        struct srd_decoder_instance *di;
-       char *protocol_id;
+       char *proto_id;
        int output_type, pdo_id;
 
        int output_type, pdo_id;
 
-       if (!(di = get_di_by_decobject(self)))
+       if (!(di = get_di_by_decobject(self))) {
+               srd_err("%s():%d decoder instance not found", __func__, __LINE__);
+               PyErr_SetString(PyExc_Exception, "decoder instance not found");
                return NULL;
                return NULL;
+       }
 
 
-       if (!PyArg_ParseTuple(args, "is", &output_type, &protocol_id))
+       if (!PyArg_ParseTuple(args, "is", &output_type, &proto_id)) {
+               if (PyErr_Occurred())
+                       PyErr_Print();
                return NULL;
                return NULL;
+       }
 
 
-       pdo_id = pd_add(di, output_type, protocol_id);
+       pdo_id = pd_add(di, output_type, proto_id);
        if (pdo_id < 0)
                Py_RETURN_NONE;
        else
        if (pdo_id < 0)
                Py_RETURN_NONE;
        else
@@ -169,23 +187,19 @@ static PyMethodDef Decoder_methods[] = {
 };
 
 
 };
 
 
-typedef struct {
-       PyObject_HEAD
-} sigrok_Decoder_object;
-
-static PyTypeObject srd_Decoder_type = {
+PyTypeObject srd_Decoder_type = {
        PyVarObject_HEAD_INIT(NULL, 0)
        .tp_name = "sigrokdecode.Decoder",
        PyVarObject_HEAD_INIT(NULL, 0)
        .tp_name = "sigrokdecode.Decoder",
-       .tp_basicsize = sizeof(sigrok_Decoder_object),
+       .tp_basicsize = sizeof(srd_Decoder),
        .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
        .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-       .tp_doc = "Sigrok Decoder object",
+       .tp_doc = "Sigrok Decoder base class",
        .tp_methods = Decoder_methods,
 };
 
 static struct PyModuleDef sigrokdecode_module = {
        PyModuleDef_HEAD_INIT,
        .m_name = "sigrokdecode",
        .tp_methods = Decoder_methods,
 };
 
 static struct PyModuleDef sigrokdecode_module = {
        PyModuleDef_HEAD_INIT,
        .m_name = "sigrokdecode",
-       .m_doc = "sigrokdecode base class",
+       .m_doc = "sigrokdecode module",
        .m_size = -1,
        .m_methods = no_methods,
 };
        .m_size = -1,
        .m_methods = no_methods,
 };
@@ -212,13 +226,13 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
                return NULL;
 
        /* expose output types as symbols in the sigrokdecode module */
                return NULL;
 
        /* expose output types as symbols in the sigrokdecode module */
-       if(PyModule_AddObject(mod, "SRD_OUTPUT_ANNOTATION",
-                       PyLong_FromLong(SRD_OUTPUT_ANNOTATION)) == -1)
+       if(PyModule_AddObject(mod, "OUTPUT_ANN",
+                       PyLong_FromLong(SRD_OUTPUT_ANN)) == -1)
                return NULL;
                return NULL;
-       if(PyModule_AddObject(mod, "SRD_OUTPUT_PROTOCOL",
-                       PyLong_FromLong(SRD_OUTPUT_PROTOCOL)) == -1)
+       if(PyModule_AddObject(mod, "OUTPUT_PROTO",
+                       PyLong_FromLong(SRD_OUTPUT_PROTO)) == -1)
                return NULL;
                return NULL;
-       if(PyModule_AddObject(mod, "SRD_OUTPUT_BINARY",
+       if(PyModule_AddObject(mod, "OUTPUT_BINARY",
                        PyLong_FromLong(SRD_OUTPUT_BINARY)) == -1)
                return NULL;
 
                        PyLong_FromLong(SRD_OUTPUT_BINARY)) == -1)
                return NULL;