Suren A. Chilingaryan 8 years ago
parent
commit
2e3ded7230
3 changed files with 4 additions and 12 deletions
  1. 2 0
      ToDo
  2. 0 7
      base.c
  3. 2 5
      private.h

+ 2 - 0
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

+ 0 - 7
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);

+ 2 - 5
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;