summaryrefslogtreecommitdiffstats
path: root/pywrap/pcipywrap.c
diff options
context:
space:
mode:
authorVasilii Chernov <vchernov@inr.ru>2016-02-26 10:19:58 +0100
committerVasilii Chernov <vchernov@inr.ru>2016-02-26 10:19:58 +0100
commite2550e6df11558ccd6e8b95f489c0988b34347af (patch)
tree7f959bbfe4a332b83e77f939a7c308d21e62b747 /pywrap/pcipywrap.c
parent3bf5383a7ea03c5aa263aa4d8acf8b4949547319 (diff)
downloadpcitool-e2550e6df11558ccd6e8b95f489c0988b34347af.tar.gz
pcitool-e2550e6df11558ccd6e8b95f489c0988b34347af.tar.bz2
pcitool-e2550e6df11558ccd6e8b95f489c0988b34347af.tar.xz
pcitool-e2550e6df11558ccd6e8b95f489c0988b34347af.zip
1. pywrap:
- fix get_registers_list crash with bank != NULL - set correct python version in cmake install step 2. html_server: - merge set and get value boxes into one box - add registers bank view mode - read registers/properties values in bank/branch view mode 3. xml/test - remove cmosis registers - add multithread safe property example
Diffstat (limited to 'pywrap/pcipywrap.c')
-rw-r--r--pywrap/pcipywrap.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/pywrap/pcipywrap.c b/pywrap/pcipywrap.c
index 64e059a..dca5973 100644
--- a/pywrap/pcipywrap.c
+++ b/pywrap/pcipywrap.c
@@ -458,17 +458,22 @@ PyObject* Pcipywrap_set_property(Pcipywrap *self, PyObject* val, const char *pro
PyObject* Pcipywrap_get_registers_list(Pcipywrap *self, const char *bank)
{
- pcilib_register_info_t *list = pcilib_get_register_list(self->ctx, bank, PCILIB_LIST_FLAGS_DEFAULT);
- PyObject* pyList = PyList_New(0);
- for(int i = 0; i < ((pcilib_t*)self->ctx)->num_reg; i++)
- {
- //serialize item attributes
- PyObject* pylistItem = pcilib_convert_register_info_to_pyobject(self->ctx, list[i]);
- pcilib_pylist_append(pyList, pylistItem);
- //Py_DECREF(pylistItem);
- }
- pcilib_free_register_info(self->ctx, list);
- return pyList;
+ pcilib_register_info_t *list = pcilib_get_register_list(self->ctx, bank, PCILIB_LIST_FLAGS_DEFAULT);
+
+ if(!list) {
+ set_python_exception("pcilib_get_register_list return NULL");
+ return NULL;
+ }
+
+ PyObject* pyList = PyList_New(0);
+ for(int i = 0; list[i].name; i++)
+ {
+ //serialize item attributes
+ PyObject* pylistItem = pcilib_convert_register_info_to_pyobject(self->ctx, list[i]);
+ pcilib_pylist_append(pyList, pylistItem);
+ }
+ pcilib_free_register_info(self->ctx, list);
+ return pyList;
}
PyObject* Pcipywrap_get_register_info(Pcipywrap *self, const char* reg,const char *bank)
@@ -551,7 +556,7 @@ PyObject* Pcipywrap_lock(Pcipywrap *self, const char *lock_id)
pcilib_lock_t* lock = pcilib_get_lock(self->ctx,
PCILIB_LOCK_FLAGS_DEFAULT,
lock_id);
- if(!lock)
+ if(!lock)
{
set_python_exception("Failed pcilib_get_lock");
return NULL;