X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=1de3b0ed12de262c0d00446f13c2cd6c01293ba4;hp=19fd3508bd723a3ed965f9c8a8b25ae165a23578;hb=10b3851672d9047941079bca052751855f5ea5fa;hpb=b33b8aa56ec27edf57cd7dc3d735370f60bfe13d diff --git a/type_decoder.c b/type_decoder.c index 19fd350..1de3b0e 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 * @@ -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 @@ -209,6 +209,7 @@ static PyMethodDef Decoder_methods[] = { {NULL, NULL, 0, NULL} }; +/** @cond PRIVATE */ SRD_PRIV PyTypeObject srd_Decoder_type = { PyVarObject_HEAD_INIT(NULL, 0) .tp_name = "sigrokdecode.Decoder", @@ -217,3 +218,4 @@ SRD_PRIV PyTypeObject srd_Decoder_type = { .tp_doc = "sigrok Decoder base class", .tp_methods = Decoder_methods, }; +/** @endcond */