summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2015-05-26 15:12:29 +0200
committerSuren A. Chilingaryan <csa@suren.me>2015-05-26 15:12:29 +0200
commit2e3ded723043e89d81df6a79112c1f68e53f3823 (patch)
tree03eed828a33f87e1801e0376a6984b66de2e4ab1
parent0c7f81f9018bc7c23f92993e288ed546744fdf92 (diff)
downloadipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.tar.gz
ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.tar.bz2
ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.tar.xz
ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.zip
Cleanup
-rw-r--r--ToDo2
-rw-r--r--base.c7
-rw-r--r--private.h7
3 files changed, 4 insertions, 12 deletions
diff --git a/ToDo b/ToDo
index a0ff257..a8a1ae1 100644
--- a/ToDo
+++ b/ToDo
@@ -4,3 +4,5 @@
- Detect actual max_lines (How?)
- When computing time for next trigger we should take into
the account: exposure time + hw readout time (complete formula)
+ - Autostop by event is broken, we are not numbering from 0
+ any more
diff --git a/base.c b/base.c
index 5336ab3..8b60b20 100644
--- a/base.c
+++ b/base.c
@@ -132,7 +132,6 @@ pcilib_context_t *ipecamera_init(pcilib_t *pcilib) {
ctx->rdma = PCILIB_DMA_ENGINE_INVALID;
- ctx->wdma = PCILIB_DMA_ENGINE_INVALID;
if (err) {
free(ctx);
@@ -535,12 +534,6 @@ int ipecamera_stop(pcilib_context_t *vctx, pcilib_event_flags_t flags) {
}
ctx->frame_mutex_destroy = 0;
}
-
-
- if (ctx->wdma != PCILIB_DMA_ENGINE_INVALID) {
- pcilib_stop_dma(vctx->pcilib, ctx->wdma, PCILIB_DMA_FLAGS_DEFAULT);
- ctx->wdma = PCILIB_DMA_ENGINE_INVALID;
- }
if (ctx->rdma != PCILIB_DMA_ENGINE_INVALID) {
pcilib_stop_dma(vctx->pcilib, ctx->rdma, PCILIB_DMA_FLAGS_DEFAULT);
diff --git a/private.h b/private.h
index b8b961d..413d558 100644
--- a/private.h
+++ b/private.h
@@ -126,14 +126,11 @@ struct ipecamera_s {
ipecamera_pixel_t *image;
size_t size;
- pcilib_event_callback_t cb;
- void *cb_user;
-
volatile pcilib_event_id_t event_id;
volatile pcilib_event_id_t preproc_id;
pcilib_event_id_t reported_id;
-
- pcilib_dma_engine_t rdma, wdma;
+
+ pcilib_dma_engine_t rdma;
pcilib_register_t control_reg, status_reg;
pcilib_register_t status2_reg, status3_reg;