summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2015-02-06 17:35:26 +0100
committerSuren A. Chilingaryan <csa@suren.me>2015-02-06 17:35:26 +0100
commitdd2ae62a852cea5be9a98ced55c11f4fdec4cb74 (patch)
tree52f2696a3cae1af0b3db687f71fb25018f21389e
parentd6c875d6261634e0c6f350faa942ccebbd106ed1 (diff)
downloadipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.tar.gz
ipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.tar.bz2
ipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.tar.xz
ipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.zip
Increase DMA timeout to 100ms for ipedma
-rw-r--r--dma/ipe.c2
-rw-r--r--dma/ipe_private.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/dma/ipe.c b/dma/ipe.c
index 7ecc153..3137ceb 100644
--- a/dma/ipe.c
+++ b/dma/ipe.c
@@ -388,7 +388,7 @@ int dma_ipe_stream_read(pcilib_dma_context_t *vctx, pcilib_dma_engine_t dma, uin
do {
switch (ret&PCILIB_STREAMING_TIMEOUT_MASK) {
case PCILIB_STREAMING_CONTINUE: wait = IPEDMA_DMA_TIMEOUT; break;
- case PCILIB_STREAMING_WAIT: wait = ((timeout<IPEDMA_DMA_TIMEOUT)?IPEDMA_DMA_TIMEOUT:timeout); break;
+ case PCILIB_STREAMING_WAIT: wait = timeout; break;
// case PCILIB_STREAMING_CHECK: wait = 0; break;
}
diff --git a/dma/ipe_private.h b/dma/ipe_private.h
index 3a00884..f621716 100644
--- a/dma/ipe_private.h
+++ b/dma/ipe_private.h
@@ -12,7 +12,7 @@
//#define IPEDMA_DEBUG
//#define IPEDMA_BUG_DMARD /**< No register read during DMA transfer */
//#define IPEDMA_DETECT_PACKETS /**< Using empty_deceted flag */
-#define IPEDMA_DMA_TIMEOUT PCILIB_DMA_TIMEOUT /**< us, overrides PCILIB_DMA_TIMEOUT */
+#define IPEDMA_DMA_TIMEOUT 100000 /**< us, overrides PCILIB_DMA_TIMEOUT (actual hardware timeout is 50ms according to Lorenzo) */
#define IPEDMA_REG_RESET 0x00
#define IPEDMA_REG_CONTROL 0x04