summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@dside.dyndns.org>2012-10-20 00:07:27 +0200
committerSuren A. Chilingaryan <csa@dside.dyndns.org>2012-10-20 00:07:27 +0200
commitb4f070ac599d009b32a1bee2b2402aed6a9a6b26 (patch)
tree13eecaec880b8c6fe8bdefe570524f58bc638fb9
parentaec34126786fe2936bb3e78e71da3d2719591cfd (diff)
downloadipecamera-b4f070ac599d009b32a1bee2b2402aed6a9a6b26.tar.gz
ipecamera-b4f070ac599d009b32a1bee2b2402aed6a9a6b26.tar.bz2
ipecamera-b4f070ac599d009b32a1bee2b2402aed6a9a6b26.tar.xz
ipecamera-b4f070ac599d009b32a1bee2b2402aed6a9a6b26.zip
For the sake of FR-revision, don't clean DMA before recording and always set frame height to 1088
-rw-r--r--ipecamera/ipecamera.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ipecamera/ipecamera.c b/ipecamera/ipecamera.c
index acd423f..25fa060 100644
--- a/ipecamera/ipecamera.c
+++ b/ipecamera/ipecamera.c
@@ -290,7 +290,8 @@ int ipecamera_start(pcilib_context_t *vctx, pcilib_event_t event_mask, pcilib_ev
ctx->cur_size = 0;
ctx->dim.width = IPECAMERA_WIDTH;
- GET_REG(n_lines_reg, ctx->dim.height);
+ ctx->dim.height = IPECAMERA_MAX_LINES;
+// GET_REG(n_lines_reg, ctx->dim.height);
GET_REG(output_mode_reg, value);
switch (value) {
@@ -407,12 +408,14 @@ int ipecamera_start(pcilib_context_t *vctx, pcilib_event_t event_mask, pcilib_ev
}
// Clean DMA
+/*
err = pcilib_skip_dma(vctx->pcilib, ctx->rdma);
if (err) {
ipecamera_stop(vctx, PCILIB_EVENT_FLAGS_DEFAULT);
pcilib_error("Can't start grabbing, device continuously writes unexpected data using DMA engine");
return err;
}
+*/
if (vctx->params.autostop.duration) {
gettimeofday(&ctx->autostop.timestamp, NULL);