srd_inst_decode(): Make the code API version dependent.

[libsigrokdecode.git] / instance.c

diff --git a/instance.c b/instance.c
index bfe9142860d76829ce2f609ddbf1bd23fbe312f1..86b826f25f9bb6656965c4522f2c99c29470114e 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include "config.h"
 #include <glib.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -30,8 +30,8 @@
 
 extern SRD_PRIV GSList *sessions;
 
-/* type_logic.c */
-extern SRD_PRIV PyTypeObject srd_logic_type;
+/* module_sigrokdecode.c */
+extern SRD_PRIV PyObject *srd_logic_type;
 
 /** @endcond */
 
@@ -163,7 +163,7 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
 err_out:
        Py_XDECREF(py_optval);
        if (PyErr_Occurred()) {
-               srd_exception_catch("Stray exception in srd_inst_option_set().");
+               srd_exception_catch("Stray exception in srd_inst_option_set()");
                ret = SRD_ERR_PYTHON;
        }
 
@@ -341,7 +341,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
        /* Create a new instance of this decoder class. */
        if (!(di->py_inst = PyObject_CallObject(dec->py_dec, NULL))) {
                if (PyErr_Occurred())
-                       srd_exception_catch("failed to create %s instance: ",
+                       srd_exception_catch("Failed to create %s instance",
                                        decoder_id);
                g_free(di->dec_channelmap);
                g_free(di);
@@ -505,7 +505,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
                        di->inst_id);
 
        if (!(py_res = PyObject_CallMethod(di->py_inst, "start", NULL))) {
-               srd_exception_catch("Protocol decoder instance %s: ",
+               srd_exception_catch("Protocol decoder instance %s",
                                di->inst_id);
                return SRD_ERR_PYTHON;
        }
@@ -522,7 +522,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
 }
 
 /**
- * Run the specified decoder function.
+ * Decode a chunk of samples.
  *
  * @param di The decoder instance to call. Must not be NULL.
  * @param start_samplenum The starting sample number for the buffer's sample
@@ -531,13 +531,11 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
  *                       set, relative to the start of capture.
  * @param inbuf The buffer to decode. Must not be NULL.
  * @param inbuflen Length of the buffer. Must be > 0.
- * @param unitsize The number of bytes per sample.
+ * @param unitsize The number of bytes per sample. Must be > 0.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *
  * @private
- *
- * @since 0.4.0
  */
 SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
                uint64_t start_samplenum, uint64_t end_samplenum,
@@ -545,14 +543,7 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
 {
        PyObject *py_res;
        srd_logic *logic;
-
-       ((struct srd_decoder_inst *)di)->data_unitsize = unitsize;
-
-       srd_dbg("Calling decode(), start sample %" PRIu64 ", end sample %"
-               PRIu64 " (%" PRIu64 " samples, %" PRIu64 " bytes, unitsize = "
-               "%d), instance %s.", start_samplenum, end_samplenum,
-               end_samplenum - start_samplenum, inbuflen, di->data_unitsize,
-               di->inst_id);
+       long apiver;
 
        /* Return an error upon unusable input. */
        if (!di) {
@@ -568,28 +559,40 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
                return SRD_ERR_ARG;
        }
 
-       /*
-        * Create new srd_logic object. Each iteration around the PD's loop
-        * will fill one sample into this object.
-        */
-       logic = PyObject_New(srd_logic, &srd_logic_type);
-       Py_INCREF(logic);
-       logic->di = (struct srd_decoder_inst *)di;
-       logic->start_samplenum = start_samplenum;
-       logic->itercnt = 0;
-       logic->inbuf = (uint8_t *)inbuf;
-       logic->inbuflen = inbuflen;
-       logic->sample = PyList_New(2);
-       Py_INCREF(logic->sample);
-
-       Py_IncRef(di->py_inst);
-       if (!(py_res = PyObject_CallMethod(di->py_inst, "decode",
+       ((struct srd_decoder_inst *)di)->data_unitsize = unitsize;
+
+       srd_dbg("Decoding: start sample %" PRIu64 ", end sample %"
+               PRIu64 " (%" PRIu64 " samples, %" PRIu64 " bytes, unitsize = "
+               "%d), instance %s.", start_samplenum, end_samplenum,
+               end_samplenum - start_samplenum, inbuflen, di->data_unitsize,
+               di->inst_id);
+
+       apiver = srd_decoder_apiver(di->decoder);
+
+       if (apiver == 2) {
+               /*
+                * Create new srd_logic object. Each iteration around the PD's
+                * loop will fill one sample into this object.
+                */
+               logic = PyObject_New(srd_logic, (PyTypeObject *)srd_logic_type);
+               Py_INCREF(logic);
+               logic->di = (struct srd_decoder_inst *)di;
+               logic->start_samplenum = start_samplenum;
+               logic->itercnt = 0;
+               logic->inbuf = (uint8_t *)inbuf;
+               logic->inbuflen = inbuflen;
+               logic->sample = PyList_New(2);
+               Py_INCREF(logic->sample);
+
+               Py_IncRef(di->py_inst);
+               if (!(py_res = PyObject_CallMethod(di->py_inst, "decode",
                        "KKO", start_samplenum, end_samplenum, logic))) {
-               srd_exception_catch("Protocol decoder instance %s: ",
-                               di->inst_id);
-               return SRD_ERR_PYTHON;
+                       srd_exception_catch("Protocol decoder instance %s",
+                                       di->inst_id);
+                       return SRD_ERR_PYTHON;
+               }
+               Py_DecRef(py_res);
        }
-       Py_DecRef(py_res);
 
        return SRD_OK;
 }