diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2016-02-23 07:20:33 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2016-02-23 07:20:33 +0100 |
| commit | a962c90543955bac98308c1b0d909048070d900a (patch) | |
| tree | 70b06851187e6bf8cfd8ee28931bdea25ea92ac7 /pcilib/view.c | |
| parent | 055279e09c3db9429e02874ec9620b9af357c80a (diff) | |
| parent | 52eb7f4fb76ddf99dedf44332aae7af4df76ab36 (diff) | |
| download | pcitool-a962c90543955bac98308c1b0d909048070d900a.tar.gz pcitool-a962c90543955bac98308c1b0d909048070d900a.tar.bz2 pcitool-a962c90543955bac98308c1b0d909048070d900a.tar.xz pcitool-a962c90543955bac98308c1b0d909048070d900a.zip | |
Merge Python scripting support from Vasiliy Chernov
Diffstat (limited to 'pcilib/view.c')
| -rw-r--r-- | pcilib/view.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pcilib/view.c b/pcilib/view.c index e31fdba..985c1b2 100644 --- a/pcilib/view.c +++ b/pcilib/view.c @@ -69,8 +69,11 @@ int pcilib_add_views_custom(pcilib_t *ctx, size_t n, const pcilib_view_descripti return PCILIB_ERROR_MEMORY; } + memcpy(cur, v, v->api->description_size); + ctx->views[ctx->num_views + i] = cur; + if (v->api->init) - view_ctx = v->api->init(ctx); + view_ctx = v->api->init(ctx, ctx->num_views + i); else { view_ctx = (pcilib_view_context_t*)malloc(sizeof(pcilib_view_context_t)); if (view_ctx) memset(view_ctx, 0, sizeof(pcilib_view_context_t)); @@ -83,14 +86,12 @@ int pcilib_add_views_custom(pcilib_t *ctx, size_t n, const pcilib_view_descripti return PCILIB_ERROR_FAILED; } - memcpy(cur, v, v->api->description_size); - view_ctx->view = ctx->num_views + i; + view_ctx->view = ctx->num_views + i; view_ctx->name = v->name; - if (refs) refs[i] = view_ctx; - HASH_ADD_KEYPTR(hh, ctx->view_hash, view_ctx->name, strlen(view_ctx->name), view_ctx); - ctx->views[ctx->num_views + i] = cur; + + if (refs) refs[i] = view_ctx; ptr += v->api->description_size; } |