X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=controller.c;h=1ed852bea9b539ca8c3cf8c5379191617e130e0c;hp=882cafbe272f25e0bee3fce5d2eb6693407b3a8c;hb=f9a3947a7a8d884de6c55693b216f89b1d27d979;hpb=a62186e44c606a8d4cb45b3d8c3cc9fa6a5038ea diff --git a/controller.c b/controller.c index 882cafb..1ed852b 100644 --- a/controller.c +++ b/controller.c @@ -2,7 +2,7 @@ * This file is part of the sigrok project. * * Copyright (C) 2010 Uwe Hermann - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,93 +19,30 @@ */ #include "config.h" -#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include +#include -/* 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 +static GSList *callbacks = NULL; +/* TODO static GSList *pipelines = NULL; - -/* lives in decoder.c */ -extern GSList *list_pds; -extern GSList *decoders; - struct srd_pipeline { int id; GSList *decoders; }; +*/ +/* lives in decoder.c */ +extern GSList *pd_list; +extern GSList *di_list; +/* lives in module_sigrokdecode.c */ +extern PyMODINIT_FUNC PyInit_sigrokdecode(void); -static PyObject *Decoder_init(PyObject *self, PyObject *args) -{ - (void)self; - (void)args; -// printf("init object %x\n", self); - - Py_RETURN_NONE; -} - - -static PyObject *Decoder_put(PyObject *self, PyObject *args) -{ - PyObject *arg; - -// printf("put object %x\n", self); - - if (!PyArg_ParseTuple(args, "O:put", &arg)) - return NULL; - - // fprintf(stdout, "sigrok.put() called by decoder:\n"); - PyObject_Print(arg, stdout, Py_PRINT_RAW); - puts(""); - - Py_RETURN_NONE; -} - -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"}, - {NULL, NULL, 0, NULL} -}; - - -// class Decoder(sigrok.Decoder): -typedef struct { - PyObject_HEAD -} sigrok_Decoder_object; - -static PyTypeObject sigrok_Decoder_type = { - PyObject_HEAD_INIT(NULL) - .tp_name = "sigrok.Decoder", - .tp_basicsize = sizeof(sigrok_Decoder_object), - .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, - .tp_doc = "Sigrok Decoder object", - .tp_methods = Decoder_methods, -}; - -PyMODINIT_FUNC init_sigrok_Decoder(void) -{ - PyObject *mod; - - sigrok_Decoder_type.tp_new = PyType_GenericNew; - if (PyType_Ready(&sigrok_Decoder_type) < 0) - return; - - mod = Py_InitModule3("sigrok", no_methods, "sigrok base classes"); - Py_INCREF(&sigrok_Decoder_type); - PyModule_AddObject(mod, "Decoder", (PyObject *)&sigrok_Decoder_type); - -} +/* lives in type_logic.c */ +extern PyTypeObject srd_logic_type; /** @@ -134,12 +71,11 @@ int srd_init(void) { int ret; + PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode); + /* Py_Initialize() returns void and usually cannot fail. */ Py_Initialize(); - init_sigrok_Decoder(); - - PyRun_SimpleString("import sys;"); if ((ret = set_modulepath()) != SRD_OK) { Py_Finalize(); return ret; @@ -171,7 +107,7 @@ int srd_exit(void) /* 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(); @@ -189,6 +125,7 @@ int set_modulepath(void) { int ret; + PyRun_SimpleString("import sys"); ret = PyRun_SimpleString("sys.path.append(r'" DECODERS_DIR "');"); return ret; @@ -210,6 +147,7 @@ struct srd_decoder_instance *srd_instance_new(const char *id) di = g_malloc(sizeof(*di)); di->decoder = dec; di->pd_output = NULL; + di->unitsize = 0; /* Create an empty Python tuple. */ if (!(py_args = PyTuple_New(0))) { /* NEWREF */ @@ -227,7 +165,7 @@ struct srd_decoder_instance *srd_instance_new(const char *id) 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); @@ -248,7 +186,7 @@ int srd_instance_set_probe(struct srd_decoder_instance *di, 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); @@ -258,22 +196,21 @@ int srd_instance_set_probe(struct srd_decoder_instance *di, } -int srd_session_start(const char *driver, int unitsize, uint64_t starttime, - uint64_t samplerate) +int srd_session_start(int num_probes, int unitsize, uint64_t samplerate) { PyObject *py_res; GSList *d; struct srd_decoder_instance *di; - fprintf(stdout, "%s: %s\n", __func__, driver); + fprintf(stdout, "%s\n", __func__); - for (d = decoders; d; d = d->next) { + for (d = di_list; d; d = d->next) { di = d->data; + di->num_probes = num_probes; + di->unitsize = unitsize; + di->samplerate = samplerate; if (!(py_res = PyObject_CallMethod(di->py_instance, "start", - "{s:s,s:l,s:l,s:l}", - "driver", driver, - "unitsize", (long)unitsize, - "starttime", (long)starttime, + "{s:l}", "samplerate", (long)samplerate))) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ @@ -293,24 +230,17 @@ int srd_session_start(const char *driver, int unitsize, uint64_t starttime, * @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 *di, 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); + srd_logic *logic; /* Return an error upon unusable input. */ - if (dec == NULL) + if (di == NULL) return SRD_ERR_ARG; /* TODO: More specific error? */ if (inbuf == NULL) return SRD_ERR_ARG; /* TODO: More specific error? */ @@ -318,14 +248,20 @@ int srd_run_decoder(struct srd_decoder_instance *dec, return SRD_ERR_ARG; /* TODO: More specific error? */ /* TODO: Error handling. */ - py_instance = dec->py_instance; + py_instance = di->py_instance; Py_XINCREF(py_instance); + logic = PyObject_New(srd_logic, &srd_logic_type); + Py_INCREF(logic); + logic->di = di; + logic->itercnt = 0; + logic->inbuf = inbuf; + logic->inbuflen = inbuflen; + logic->sample = PyList_New(2); + Py_INCREF(logic->sample); + if (!(py_res = PyObject_CallMethod(py_instance, "decode", - "{s:i,s:i,s:s#}", - "time", _timehack, - "duration", 10, - "data", inbuf, inbuflen))) { /* NEWREF */ + "KKO", timeoffset, duration, logic))) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ @@ -333,20 +269,23 @@ int srd_run_decoder(struct srd_decoder_instance *dec, } Py_XDECREF(py_res); + return SRD_OK; } /* 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; } @@ -354,18 +293,79 @@ int srd_session_feed(uint8_t *inbuf, uint64_t inbuflen) } +int pd_add(struct srd_decoder_instance *di, int output_type, + char *protocol_id) +{ + struct srd_pd_output *pdo; + + if (!(pdo = g_try_malloc(sizeof(struct srd_pd_output)))) + return -1; + + /* pdo_id is just a simple index, nothing is deleted from this list anway */ + pdo->pdo_id = g_slist_length(di->pd_output); + pdo->output_type = output_type; + pdo->decoder = di->decoder; + pdo->protocol_id = g_strdup(protocol_id); + di->pd_output = g_slist_append(di->pd_output, pdo); + + fprintf(stdout, "%s: output type %d, protocol_id %s, id %d\n", + __func__, output_type, protocol_id, pdo->pdo_id); + + return pdo->pdo_id; +} + +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; +} + +int srd_register_callback(int output_type, void *cb) +{ + struct srd_pd_callback *pd_cb; + + if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback)))) + return SRD_ERR_MALLOC; + + pd_cb->output_type = output_type; + pd_cb->callback = cb; + callbacks = g_slist_append(callbacks, pd_cb); + + printf("got cb for %d: %p\n", output_type, cb); + return SRD_OK; +} + +void *srd_find_callback(int output_type) +{ + GSList *l; + struct srd_pd_callback *pd_cb; + void *(cb); + + cb = NULL; + for (l = callbacks; l; l = l->next) { + pd_cb = l->data; + if (pd_cb->output_type == output_type) { + cb = pd_cb->callback; + break; + } + } + + return cb; +} + //int srd_pipeline_new(int plid) //{ // // //} -// -// -//int pd_output_new(int output_type, char *output_id, char *description) -//{ -// -// -//}