X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=instance.c;h=b1bfd81ce0bf2fef4281087ce5f967d3afc75061;hb=af21ec73e2bf2a6aaec758b090902e7cf3ab96ad;hp=3fa3e5dc8b4ec857817f3ac4a8a3902789cef72b;hpb=2730fe2397101f2c0a66abd3a7fd5fa531d3c710;p=libsigrokdecode.git
diff --git a/instance.c b/instance.c
index 3fa3e5d..b1bfd81 100644
--- a/instance.c
+++ b/instance.c
@@ -18,9 +18,9 @@
* along with this program. If not, see .
*/
+#include
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
-#include "config.h"
#include
#include
#include
@@ -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,6 +543,7 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
{
PyObject *py_res;
srd_logic *logic;
+ long apiver;
/* Return an error upon unusable input. */
if (!di) {
@@ -559,37 +558,45 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
srd_dbg("empty buffer");
return SRD_ERR_ARG;
}
+ if (unitsize == 0) {
+ srd_dbg("unitsize 0");
+ return SRD_ERR_ARG;
+ }
((struct srd_decoder_inst *)di)->data_unitsize = unitsize;
- srd_dbg("Calling decode(), start sample %" PRIu64 ", end sample %"
+ 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);
- /*
- * 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",
+ 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;
}