diff options
author | Suren A. Chilingaryan <csa@suren.me> | 2015-05-26 15:12:29 +0200 |
---|---|---|
committer | Suren A. Chilingaryan <csa@suren.me> | 2015-05-26 15:12:29 +0200 |
commit | 2e3ded723043e89d81df6a79112c1f68e53f3823 (patch) | |
tree | 03eed828a33f87e1801e0376a6984b66de2e4ab1 | |
parent | 0c7f81f9018bc7c23f92993e288ed546744fdf92 (diff) | |
download | ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.tar.gz ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.tar.bz2 ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.tar.xz ipecamera-2e3ded723043e89d81df6a79112c1f68e53f3823.zip |
Cleanup
-rw-r--r-- | ToDo | 2 | ||||
-rw-r--r-- | base.c | 7 | ||||
-rw-r--r-- | private.h | 7 |
3 files changed, 4 insertions, 12 deletions
@@ -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 @@ -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); @@ -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; |