diff options
Diffstat (limited to 'pywrap/pcipywrap.c')
| -rw-r--r-- | pywrap/pcipywrap.c | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/pywrap/pcipywrap.c b/pywrap/pcipywrap.c index dca5973..391bdf4 100644 --- a/pywrap/pcipywrap.c +++ b/pywrap/pcipywrap.c @@ -281,7 +281,7 @@ PyObject * pcilib_convert_register_info_to_pyobject(pcilib_t* ctx, pcilib_regist { PyObject* values = PyList_New(0); - + for (int j = 0; listItem.values[j].name; j++) { PyObject* valuesItem = PyDict_New(); @@ -306,9 +306,9 @@ PyObject * pcilib_convert_register_info_to_pyobject(pcilib_t* ctx, pcilib_regist if(listItem.values[j].description) { pcilib_pydict_set_item(valuesItem, - PyString_FromString("description"), - PyString_FromString(listItem.values[j].description)); - + PyString_FromString("description"), + PyString_FromString(listItem.values[j].description)); + } pcilib_pylist_append(values, valuesItem); } @@ -319,7 +319,7 @@ PyObject * pcilib_convert_register_info_to_pyobject(pcilib_t* ctx, pcilib_regist } return pylistItem; - + } Pcipywrap *new_Pcipywrap(const char* fpga_device, const char* model) @@ -512,101 +512,101 @@ PyObject* Pcipywrap_get_property_list(Pcipywrap *self, const char* branch) PyObject* Pcipywrap_read_dma(Pcipywrap *self, unsigned char dma, size_t size) { - int err; - void* buf = NULL; - size_t real_size; - - err = pcilib_read_dma(self->ctx, dma, (uintptr_t)NULL, size, buf, &real_size); - if(err) - { - set_python_exception("Failed pcilib_read_dma", err); - return NULL; - } - - - PyObject* py_buf = PyByteArray_FromStringAndSize((const char*)buf, real_size); - if(buf) - free(buf); - - return py_buf; + int err; + void* buf = NULL; + size_t real_size; + + err = pcilib_read_dma(self->ctx, dma, (uintptr_t)NULL, size, buf, &real_size); + if(err) + { + set_python_exception("Failed pcilib_read_dma", err); + return NULL; + } + + + PyObject* py_buf = PyByteArray_FromStringAndSize((const char*)buf, real_size); + if(buf) + free(buf); + + return py_buf; } PyObject* Pcipywrap_lock_global(Pcipywrap *self) { - int err; - - err = pcilib_lock_global(self->ctx); - if(err) - { - set_python_exception("Failed pcilib_lock_global"); - return NULL; - } - - return PyInt_FromLong((long)1); + int err; + + err = pcilib_lock_global(self->ctx); + if(err) + { + set_python_exception("Failed pcilib_lock_global"); + return NULL; + } + + return PyInt_FromLong((long)1); } void Pcipywrap_unlock_global(Pcipywrap *self) { - pcilib_unlock_global(self->ctx); - return; + pcilib_unlock_global(self->ctx); + return; } -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) - { - set_python_exception("Failed pcilib_get_lock"); - return NULL; - } - - - int err = pcilib_lock(lock); - if(err) - { - set_python_exception("Failed pcilib_lock"); - return NULL; - } - - return PyInt_FromLong((long)1); +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) + { + set_python_exception("Failed pcilib_get_lock"); + return NULL; + } + + + int err = pcilib_lock(lock); + if(err) + { + set_python_exception("Failed pcilib_lock"); + return NULL; + } + + return PyInt_FromLong((long)1); } PyObject* Pcipywrap_try_lock(Pcipywrap *self, const char *lock_id) { - pcilib_lock_t* lock = pcilib_get_lock(self->ctx, - PCILIB_LOCK_FLAGS_DEFAULT, - lock_id); + pcilib_lock_t* lock = pcilib_get_lock(self->ctx, + PCILIB_LOCK_FLAGS_DEFAULT, + lock_id); if(!lock) - { - set_python_exception("Failed pcilib_get_lock"); - return NULL; - } - - int err = pcilib_try_lock(lock); - if(err) - { - set_python_exception("Failed pcilib_try_lock"); - return NULL; - } - - return PyInt_FromLong((long)1); + { + set_python_exception("Failed pcilib_get_lock"); + return NULL; + } + + int err = pcilib_try_lock(lock); + if(err) + { + set_python_exception("Failed pcilib_try_lock"); + return NULL; + } + + return PyInt_FromLong((long)1); } PyObject* Pcipywrap_unlock(Pcipywrap *self, const char *lock_id) { - pcilib_lock_t* lock = pcilib_get_lock(self->ctx, - PCILIB_LOCK_FLAGS_DEFAULT, - lock_id); + pcilib_lock_t* lock = pcilib_get_lock(self->ctx, + PCILIB_LOCK_FLAGS_DEFAULT, + lock_id); if(!lock) - { - set_python_exception("Failed pcilib_get_lock"); - return NULL; - } - - pcilib_unlock(lock); - return PyInt_FromLong((long)1); + { + set_python_exception("Failed pcilib_get_lock"); + return NULL; + } + + pcilib_unlock(lock); + return PyInt_FromLong((long)1); } |