#include "config.h"
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <glib.h>
-
-/* TODO: this should probably be in sigrokdecode.h */
-/* Re-define some string functions for Python >= 3.0. */
-#if PY_VERSION_HEX >= 0x03000000
-#define PyString_AsString PyBytes_AsString
-#define PyString_FromString PyBytes_FromString
-#define PyString_Check PyBytes_Check
-#endif
+#include <inttypes.h>
+/* TODO
static GSList *pipelines = NULL;
+*/
/* lives in decoder.c */
-extern GSList *list_pds;
-extern GSList *decoders;
+extern GSList *pd_list;
+extern GSList *di_list;
struct srd_pipeline {
int id;
Py_RETURN_NONE;
}
+struct srd_decoder_instance *get_di_by_decobject(void *decobject);
static PyObject *Decoder_put(PyObject *self, PyObject *args)
{
- PyObject *arg;
+ GSList *l;
+ PyObject *data;
+ struct srd_decoder_instance *di;
+ struct srd_pd_output *pdo;
+ uint64_t timeoffset, duration;
+ int output_id;
+
+ if (!(di = get_di_by_decobject(self)))
+ return NULL;
+
+ if (!PyArg_ParseTuple(args, "KKiO", &timeoffset, &duration, &output_id, &data))
+ return NULL;
-// printf("put object %x\n", self);
+ printf("put: %s instance %p time %" PRIu64 " duration %" PRIu64 " ",
+ di->decoder->name, di, timeoffset, duration);
- if (!PyArg_ParseTuple(args, "O:put", &arg))
+ if (!(l = g_slist_nth(di->pd_output, output_id)))
+ /* PD supplied invalid output id */
+ /* TODO: better error message */
return NULL;
+ pdo = l->data;
- // fprintf(stdout, "sigrok.put() called by decoder:\n");
- PyObject_Print(arg, stdout, Py_PRINT_RAW);
+ printf("stream %d: ", pdo->output_type);
+ PyObject_Print(data, stdout, Py_PRINT_RAW);
puts("");
Py_RETURN_NONE;
}
+
+static PyObject *Decoder_output_new(PyObject *self, PyObject *py_output_type)
+{
+ PyObject *ret;
+ struct srd_decoder_instance *di;
+ char *protocol_id, *description;
+ int output_type, pdo_id;
+
+ if (!(di = get_di_by_decobject(self)))
+ return NULL;
+
+ printf("output_new di %s\n", di->decoder->name);
+
+// if (!PyArg_ParseTuple(args, "i:output_type,s:protocol_id,s:description",
+// &output_type, &protocol_id, &description))
+ if (!PyArg_ParseTuple(py_output_type, "i:output_type", &output_type))
+ return NULL;
+
+ protocol_id = "i2c";
+ description = "blah";
+ pdo_id = pd_output_new(di, output_type, protocol_id, description);
+ if (pdo_id < 0)
+ Py_RETURN_NONE;
+ else
+ ret = Py_BuildValue("i", pdo_id);
+
+ return ret;
+}
+
static PyMethodDef no_methods[] = { {NULL, NULL, 0, NULL} };
static PyMethodDef Decoder_methods[] = {
{"__init__", Decoder_init, METH_VARARGS, ""},
{"put", Decoder_put, METH_VARARGS,
"Accepts a dictionary with the following keys: time, duration, data"},
+ {"output_new", Decoder_output_new, METH_VARARGS,
+ "Create a new output stream"},
{NULL, NULL, 0, NULL}
};
-// class Decoder(sigrok.Decoder):
typedef struct {
PyObject_HEAD
} sigrok_Decoder_object;
static PyTypeObject sigrok_Decoder_type = {
- PyObject_HEAD_INIT(NULL)
+ PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "sigrok.Decoder",
.tp_basicsize = sizeof(sigrok_Decoder_object),
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.tp_methods = Decoder_methods,
};
-PyMODINIT_FUNC init_sigrok_Decoder(void)
+static struct PyModuleDef sigrok_Decoder_module = {
+ PyModuleDef_HEAD_INIT,
+ .m_name = "sigrok",
+ .m_doc = "sigrok base classes",
+ .m_size = -1,
+ .m_methods = no_methods,
+};
+
+PyMODINIT_FUNC PyInit_sigrok(void)
{
PyObject *mod;
+ /* assign this here, for compiler portability */
sigrok_Decoder_type.tp_new = PyType_GenericNew;
if (PyType_Ready(&sigrok_Decoder_type) < 0)
- return;
+ return NULL;
- mod = Py_InitModule3("sigrok", no_methods, "sigrok base classes");
+// mod = Py_InitModule3("sigrok", no_methods, "sigrok base classes");
+ mod = PyModule_Create(&sigrok_Decoder_module);
Py_INCREF(&sigrok_Decoder_type);
- PyModule_AddObject(mod, "Decoder", (PyObject *)&sigrok_Decoder_type);
+ if (PyModule_AddObject(mod, "Decoder", (PyObject *)&sigrok_Decoder_type) == -1)
+ return NULL;
+ return mod;
}
+struct srd_decoder_instance *get_di_by_decobject(void *decobject)
+{
+ GSList *l;
+ struct srd_decoder_instance *di;
+
+ for (l = di_list; l; l = l->next) {
+ di = l->data;
+ if (decobject == di->py_instance)
+ return di;
+ }
+
+ return NULL;
+}
+
/**
* Initialize libsigrokdecode.
*
{
int ret;
+ PyImport_AppendInittab("sigrok", PyInit_sigrok);
+
/* Py_Initialize() returns void and usually cannot fail. */
Py_Initialize();
- init_sigrok_Decoder();
+ PyInit_sigrok();
PyRun_SimpleString("import sys;");
if ((ret = set_modulepath()) != SRD_OK) {
/* Unload/free all decoders, and then the list of decoders itself. */
/* TODO: Error handling. */
srd_unload_all_decoders();
- g_slist_free(list_pds);
+ g_slist_free(pd_list);
/* Py_Finalize() returns void, any finalization errors are ignored. */
Py_Finalize();
Py_XDECREF(py_args);
return NULL; /* TODO: More specific error? */
}
- decoders = g_slist_append(decoders, di);
+ di_list = g_slist_append(di_list, di);
Py_XDECREF(py_args);
return SRD_ERR_PYTHON; /* TODO: More specific error? */
}
- probenum = PyInt_FromLong(num);
+ probenum = PyLong_FromLong(num);
PyMapping_SetItemString(probedict, (char *)probename, probenum);
Py_XDECREF(probenum);
fprintf(stdout, "%s: %s\n", __func__, driver);
- for (d = decoders; d; d = d->next) {
+ for (d = di_list; d; d = d->next) {
di = d->data;
if (!(py_res = PyObject_CallMethod(di->py_instance, "start",
"{s:s,s:l,s:l,s:l}",
* @param dec TODO
* @param inbuf TODO
* @param inbuflen TODO
- * @param outbuf TODO
- * @param outbuflen TODO
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
-int srd_run_decoder(struct srd_decoder_instance *dec,
- uint8_t *inbuf, uint64_t inbuflen)
+int srd_run_decoder(uint64_t timeoffset, uint64_t duration,
+ struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen)
{
PyObject *py_instance, *py_res;
- /* FIXME: Don't have a timebase available here. Make one up. */
- static int _timehack = 0;
-
- _timehack += inbuflen;
// fprintf(stdout, "%s: %s\n", __func__, dec->decoder->name);
+// printf("to %u du %u len %d\n", timeoffset, duration, inbuflen);
/* Return an error upon unusable input. */
if (dec == NULL)
Py_XINCREF(py_instance);
if (!(py_res = PyObject_CallMethod(py_instance, "decode",
- "{s:i,s:i,s:s#}",
- "time", _timehack,
- "duration", 10,
- "data", inbuf, inbuflen))) { /* NEWREF */
+ "KKy#", timeoffset, duration, inbuf, inbuflen))) {
if (PyErr_Occurred())
PyErr_Print(); /* Returns void. */
/* Feed logic samples to decoder session. */
-int srd_session_feed(uint8_t *inbuf, uint64_t inbuflen)
+int srd_session_feed(uint64_t timeoffset, uint64_t duration, uint8_t *inbuf,
+ uint64_t inbuflen)
{
GSList *d;
int ret;
// fprintf(stdout, "%s: %d bytes\n", __func__, inbuflen);
- for (d = decoders; d; d = d->next) {
- if ((ret = srd_run_decoder(d->data, inbuf, inbuflen)) != SRD_OK)
+ for (d = di_list; d; d = d->next) {
+ if ((ret = srd_run_decoder(timeoffset, duration, d->data, inbuf,
+ inbuflen)) != SRD_OK)
return ret;
}
}
+int pd_output_new(struct srd_decoder_instance *di, int output_type,
+ char *protocol_id, char *description)
+{
+ GSList *l;
+ struct srd_pd_output *pdo;
+ int pdo_id;
+
+ fprintf(stdout, "%s: output type %d, protocol_id %s, description %s\n",
+ __func__, output_type, protocol_id, description);
+
+ pdo_id = -1;
+ for (l = di->pd_output; l; l = l->next) {
+ pdo = l->data;
+ if (pdo->pdo_id > pdo_id)
+ pdo_id = pdo->pdo_id;
+ }
+ pdo_id++;
+
+ if (!(pdo = g_try_malloc(sizeof(struct srd_pd_output))))
+ return -1;
+
+ pdo->pdo_id = pdo_id;
+ pdo->output_type = output_type;
+ pdo->protocol_id = g_strdup(protocol_id);
+ pdo->description = g_strdup(description);
+ di->pd_output = g_slist_append(di->pd_output, pdo);
+
+ return pdo_id;
+}
+
+
//int srd_pipeline_new(int plid)
//{
//
//
//}
-//
-//
-//int pd_output_new(int output_type, char *output_id, char *description)
-//{
-//
-//
-//}
projects / libsigrokdecode.git / blobdiff