diff options
author | Vasilii Chernov <vchernov@inr.ru> | 2016-02-12 17:50:57 +0100 |
---|---|---|
committer | Vasilii Chernov <vchernov@inr.ru> | 2016-02-12 17:50:57 +0100 |
commit | 1b3342649294c6ce99aeb82664a29eac47687ee5 (patch) | |
tree | fb34ee89e1edc4dd3e27c2a1416a435192c7ae6b /pcilib/pci.c | |
parent | 55eab7196d0104c71e40136b3b22e9501d234e17 (diff) | |
download | pcitool-1b3342649294c6ce99aeb82664a29eac47687ee5.tar.gz pcitool-1b3342649294c6ce99aeb82664a29eac47687ee5.tar.bz2 pcitool-1b3342649294c6ce99aeb82664a29eac47687ee5.tar.xz pcitool-1b3342649294c6ce99aeb82664a29eac47687ee5.zip |
Move python module init code to transfom view constructor
Update python logger and python exeption messages
Change serialization method in create_pcilib_instance set_pcilib functions
Diffstat (limited to 'pcilib/pci.c')
-rw-r--r-- | pcilib/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pcilib/pci.c b/pcilib/pci.c index cc2a67a..c38097f 100644 --- a/pcilib/pci.c +++ b/pcilib/pci.c @@ -192,12 +192,14 @@ pcilib_t *pcilib_open(const char *device, const char *model) { return NULL; } + xmlerr = pcilib_init_xml(ctx, ctx->model); if ((xmlerr)&&(xmlerr != PCILIB_ERROR_NOTFOUND)) { pcilib_error("Error (%i) initializing XML subsystem for model %s", xmlerr, ctx->model); pcilib_close(ctx); return NULL; } + // We have found neither standard model nor XML if ((err)&&(xmlerr)) { @@ -219,7 +221,6 @@ pcilib_t *pcilib_open(const char *device, const char *model) { pcilib_close(ctx); return NULL; } - err = pcilib_init_event_engine(ctx); if (err) { pcilib_error("Error (%i) initializing event engine\n", err); |