summaryrefslogtreecommitdiffstats
path: root/xml
diff options
context:
space:
mode:
authorVasilii Chernov <vchernov@inr.ru>2016-02-16 16:30:40 +0100
committerVasilii Chernov <vchernov@inr.ru>2016-02-16 16:30:40 +0100
commited9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590 (patch)
tree8b05ef6a4585b0d585f82c468cf92048a05f79ee /xml
parentfc80d8b64672785b4d9c7127e852ca9bf19c9194 (diff)
downloadpcitool-ed9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590.tar.gz
pcitool-ed9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590.tar.bz2
pcitool-ed9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590.tar.xz
pcitool-ed9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590.zip
1. Add python thread initialization to pcilib_init_py()
-Fix pcilib_script_run_func() work in multithread mode 2. pcilib_close() - Move free_py() code after free views to make view destructors work properly 3. Move script hash to pcilib_py_s 4. Move pcilib_get_logger() pcilib_get_logger_min_prio() and pcilib_get_logger_argument() declarations to error.h 5. Refactor pcilib_get_value_as_pyobject pcilib_set_value_from_pyobject to more unified form 6. Add more memory checks. Fix some string memory allocations. 7. Refactor pcilib_py_s member names. 8. Merge pcilib_script_read() and pcilib_script_write() to pcilib_script_run_func() 9. Update test_pywrap views scripts
Diffstat (limited to 'xml')
-rw-r--r--xml/test_pywrap/test_prop2.py10
-rw-r--r--xml/test_pywrap/test_prop3.py9
2 files changed, 11 insertions, 8 deletions
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index 69a2190..d7e10bc 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -1,8 +1,8 @@
import pcipywrap
+
+def read_from_register(value):
+ return pcipywrap.get_property('/test/prop3') / 2
-def read_from_register():
- return pcipywrap.get_property('/registers/fpga/reg1') / 2
-
-def write_to_register(value):
- pcipywrap.set_property(value*3, '/registers/fpga/reg1')
+def write_to_register(value):
+ pcipywrap.set_property(value*2, '/test/prop3')
diff --git a/xml/test_pywrap/test_prop3.py b/xml/test_pywrap/test_prop3.py
index c1300b3..9d33b63 100644
--- a/xml/test_pywrap/test_prop3.py
+++ b/xml/test_pywrap/test_prop3.py
@@ -1,4 +1,7 @@
-import os
+import pcipywrap
+
+def read_from_register(value):
+ return pcipywrap.get_property('/registers/fpga/reg1')
-def read_from_register():
- return 10;
+def write_to_register(value):
+ pcipywrap.set_property(value, '/registers/fpga/reg1')