diff options
author | Vasilii Chernov <vchernov@inr.ru> | 2016-02-17 11:01:22 +0100 |
---|---|---|
committer | Vasilii Chernov <vchernov@inr.ru> | 2016-02-17 11:01:22 +0100 |
commit | 3269dce32883e14b45cc490a0cc0037b4c808a68 (patch) | |
tree | ad4a551ac5ccfb8ed74d01095c7dad00c532c84c /pcilib/pci.c | |
parent | ed9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590 (diff) | |
download | pcitool-3269dce32883e14b45cc490a0cc0037b4c808a68.tar.gz pcitool-3269dce32883e14b45cc490a0cc0037b4c808a68.tar.bz2 pcitool-3269dce32883e14b45cc490a0cc0037b4c808a68.tar.xz pcitool-3269dce32883e14b45cc490a0cc0037b4c808a68.zip |
1. Add cmake BUILD_PYTHON_MODULES option.
2. Rename log options getting functions.
3. py:
- pcilib_init_py() - extract pcilib_py_add_script_dir()
- pcilib_py_init_script() - extract view-specialized code to
pcilib_py_get_transform_script_properties()
3. pcilib_open():
- move pcilib_init_py() to previous position.
- add extract pcilib_py_add_script_dir()
4. pcilib_script_s - change hash key. Now it is (const char*) and contains
script file name with extension
5. pcipywrap:
- Add pcipywrap.h to remove swig generated file complile warnings
- remove -includeall swig flag to prevent crash in multi-thread scripts
- change set python expetion mechanic
Diffstat (limited to 'pcilib/pci.c')
-rw-r--r-- | pcilib/pci.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pcilib/pci.c b/pcilib/pci.c index 58ee4b0..2b7b97b 100644 --- a/pcilib/pci.c +++ b/pcilib/pci.c @@ -144,6 +144,13 @@ pcilib_t *pcilib_open(const char *device, const char *model) { pcilib_close(ctx); return NULL; } + + err = pcilib_init_py(ctx); + if (err) { + pcilib_error("Error (%i) initializing python subsystem", err); + pcilib_close(ctx); + return NULL; + } ctx->alloc_reg = PCILIB_DEFAULT_REGISTER_SPACE; ctx->alloc_views = PCILIB_DEFAULT_VIEW_SPACE; @@ -185,9 +192,9 @@ pcilib_t *pcilib_open(const char *device, const char *model) { if (!ctx->model) ctx->model = strdup(model?model:"pci"); - err = pcilib_init_py(ctx); + err = pcilib_py_add_script_dir(ctx); if (err) { - pcilib_error("Error (%i) initializing python subsystem", err); + pcilib_error("Error (%i) add script path to python path", err); pcilib_close(ctx); return NULL; } |