diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-07-19 17:59:25 +0200 | 
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-07-19 17:59:25 +0200 | 
| commit | b646194911cd70e91e84c8354d5bac35b27156df (patch) | |
| tree | 81a9b56faa50eaf04981ae9f756a5b84e4f4ba24 /ipecamera | |
| parent | 9e424252a35879f121e7ea4531a9ab3dda56d595 (diff) | |
| download | ipecamera-b646194911cd70e91e84c8354d5bac35b27156df.tar.gz ipecamera-b646194911cd70e91e84c8354d5bac35b27156df.tar.bz2 ipecamera-b646194911cd70e91e84c8354d5bac35b27156df.tar.xz ipecamera-b646194911cd70e91e84c8354d5bac35b27156df.zip  | |
Few fixes for IPE Camera modification
Diffstat (limited to 'ipecamera')
| -rw-r--r-- | ipecamera/image.c | 6 | ||||
| -rw-r--r-- | ipecamera/model.h | 2 | 
2 files changed, 7 insertions, 1 deletions
diff --git a/ipecamera/image.c b/ipecamera/image.c index 0fe8da8..62ab695 100644 --- a/ipecamera/image.c +++ b/ipecamera/image.c @@ -181,8 +181,12 @@ pcilib_dma_context_t *ipecamera_init_dma(pcilib_context_t *vctx) {  	pcilib_error("The DMA engine is not configured in model");  	return NULL;      } -     + +#ifdef IPECAMERA_DMA_R3 +    return model_info->dma_api->init(ctx->pcilib, PCILIB_NWL_MODIFICATION_IPECAMERA, NULL); +#else      return model_info->dma_api->init(ctx->pcilib, PCILIB_DMA_MODIFICATION_DEFAULT, NULL); +#endif  } diff --git a/ipecamera/model.h b/ipecamera/model.h index a460dde..9e78ab3 100644 --- a/ipecamera/model.h +++ b/ipecamera/model.h @@ -6,6 +6,8 @@  #include "pcilib.h"  #include "image.h" +//#define IPECAMERA_DMA_R3 +  //#define IPECAMERA_REGISTER_SPACE 0xfeaffc00  #define IPECAMERA_REGISTER_SPACE 0x9000  #define IPECAMERA_REGISTER_WRITE (IPECAMERA_REGISTER_SPACE + 0)  | 
