From 616853e5f2ca5f7306c667bb2bb443f9ad09d853 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Thu, 4 Feb 2016 03:24:23 +0100 Subject: Update to new version of pcitool --- base.c | 9 +++++---- cmosis.c | 9 +++++---- events.c | 1 + model.c | 6 ++++-- reader.c | 1 + 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/base.c b/base.c index 20183b0..92b62d9 100644 --- a/base.c +++ b/base.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include "private.h" #include "model.h" @@ -131,12 +133,12 @@ pcilib_context_t *ipecamera_init(pcilib_t *pcilib) { switch (value) { case IPECAMERA_FIRMWARE_UFO5: ctx->firmware = value; - err = pcilib_add_registers(pcilib, 0, cmosis_registers); + err = pcilib_add_registers(pcilib, 0, 0, cmosis_registers, NULL); break; case IPECAMERA_FIRMWARE_CMOSIS20: ctx->firmware = value; ctx->buffer_size = IPECAMERA_DEFAULT_CMOSIS20_BUFFER_SIZE; - err = pcilib_add_registers(pcilib, 0, cmosis20000_registers); + err = pcilib_add_registers(pcilib, 0, 0, cmosis20000_registers, NULL); break; default: ctx->firmware = IPECAMERA_FIRMWARE_UNKNOWN; @@ -199,7 +201,7 @@ pcilib_dma_context_t *ipecamera_init_dma(pcilib_context_t *vctx) { } if (ctx->firmware) { - return model_info->dma->api->init(vctx->pcilib, NULL, NULL); + return model_info->dma->api->init(vctx->pcilib, "ipecamera", NULL); } else { return model_info->dma->api->init(vctx->pcilib, "pci", NULL); } @@ -654,7 +656,6 @@ int ipecamera_stop(pcilib_context_t *vctx, pcilib_event_flags_t flags) { free(ctx->buffer); ctx->buffer = NULL; } - memset(&ctx->autostop, 0, sizeof(ipecamera_autostop_t)); diff --git a/cmosis.c b/cmosis.c index 49bc1d5..5d98c14 100644 --- a/cmosis.c +++ b/cmosis.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "cmosis.h" #include "private.h" @@ -75,8 +76,8 @@ int ipecamera_cmosis_read(pcilib_t *ctx, pcilib_register_bank_context_t *reg_ban assert(addr < 128); - wr = pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr); - rd = pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr); + wr = pcilib_resolve_bar_address(ctx, bank->bar, bank->write_addr); + rd = pcilib_resolve_bar_address(ctx, bank->bar, bank->read_addr); if ((!rd)||(!wr)) { pcilib_error("Error resolving addresses of read & write registers"); return PCILIB_ERROR_INVALID_ADDRESS; @@ -171,8 +172,8 @@ int ipecamera_cmosis_write(pcilib_t *ctx, pcilib_register_bank_context_t *reg_ba assert(addr < 128); assert(value < 256); - wr = pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr); - rd = pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr); + wr = pcilib_resolve_bar_address(ctx, bank->bar, bank->write_addr); + rd = pcilib_resolve_bar_address(ctx, bank->bar, bank->read_addr); if ((!rd)||(!wr)) { pcilib_error("Error resolving addresses of read & write registers"); return PCILIB_ERROR_INVALID_ADDRESS; diff --git a/events.c b/events.c index e719e2d..76c274b 100644 --- a/events.c +++ b/events.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "ipecamera.h" #include "private.h" diff --git a/model.c b/model.c index 5b56522..5ba55a2 100644 --- a/model.c +++ b/model.c @@ -15,7 +15,7 @@ enum ipecamera_protocol_s { static const pcilib_register_protocol_api_description_t ipecamera_cmosis_protocol_api = - { IPECAMERA_VERSION, ipecamera_cmosis_open, ipecamera_cmosis_close, ipecamera_cmosis_read, ipecamera_cmosis_write }; + { IPECAMERA_VERSION, ipecamera_cmosis_open, ipecamera_cmosis_close, NULL, ipecamera_cmosis_read, ipecamera_cmosis_write }; /* static const pcilib_dma_description_t ipecamera_dma = @@ -86,7 +86,7 @@ const pcilib_register_description_t cmosis_registers[] = { }; const pcilib_register_description_t cmosis20000_registers[] = { -{15, 0, 2, 1, 0, PCILIB_REGISTER_RW, PCILIB_REGISTER_STANDARD, PCILIB_REGISTER_BANK0, "cmosis_nr_slopes", ""}, +{15, 0, 2, 1, 0, PCILIB_REGISTER_RW, PCILIB_REGISTER_STANDARD, PCILIB_REGISTER_BANK0, "cmosis_nr_slopes_ex", ""}, {22, 0, 16, 1, 0, PCILIB_REGISTER_RW, PCILIB_REGISTER_STANDARD, PCILIB_REGISTER_BANK0, "cmosis_number_frames", ""}, {24, 0, 16, 0, 0, PCILIB_REGISTER_RW, PCILIB_REGISTER_STANDARD, PCILIB_REGISTER_BANK0, "cmosis_start_single", ""}, {26, 0, 16, 3840, 0, PCILIB_REGISTER_RW, PCILIB_REGISTER_STANDARD, PCILIB_REGISTER_BANK0, "cmosis_number_lines_single", ""}, @@ -231,6 +231,8 @@ static const pcilib_model_description_t ipecamera_models[] = {{ ipecamera_banks, ipecamera_protocols, ipecamera_ranges, + NULL, + NULL, ipecamera_events, ipecamera_data_types, "ipecamera", diff --git a/reader.c b/reader.c index ede5b62..0799a18 100644 --- a/reader.c +++ b/reader.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "model.h" #include "private.h" -- cgit v1.2.3