diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2014-12-19 00:14:21 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2014-12-19 00:14:21 +0100 |
| commit | a640c40c6bcf4bad0b78e0ea6ea04f2a5f3f877f (patch) | |
| tree | 7a6b899c130510e3cca87c23b26a5a1ffc033f20 /ipecamera | |
| parent | 0e16eeef08ed9b27f0fbc7f02a562a81e10c4119 (diff) | |
| download | ipecamera-a640c40c6bcf4bad0b78e0ea6ea04f2a5f3f877f.tar.gz ipecamera-a640c40c6bcf4bad0b78e0ea6ea04f2a5f3f877f.tar.bz2 ipecamera-a640c40c6bcf4bad0b78e0ea6ea04f2a5f3f877f.tar.xz ipecamera-a640c40c6bcf4bad0b78e0ea6ea04f2a5f3f877f.zip | |
Initial implementation of IPEDMA, dummy driver for KAPTURE, start of API changes
Diffstat (limited to 'ipecamera')
| -rw-r--r-- | ipecamera/ipecamera.c | 4 | ||||
| -rw-r--r-- | ipecamera/model.h | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ipecamera/ipecamera.c b/ipecamera/ipecamera.c index 1681f7c..fe66948 100644 --- a/ipecamera/ipecamera.c +++ b/ipecamera/ipecamera.c @@ -23,12 +23,8 @@ #include "events.h" #include "data.h" -#include "dma/nwl_dma.h" -#ifdef IPECAMERA_DEBUG #include "dma/nwl.h" -#endif /* IPECAMERA_DEBUG */ - #define FIND_REG(var, bank, name) \ ctx->var = pcilib_find_register(pcilib, bank, name); \ diff --git a/ipecamera/model.h b/ipecamera/model.h index 26505ee..cc47891 100644 --- a/ipecamera/model.h +++ b/ipecamera/model.h @@ -152,9 +152,13 @@ extern pcilib_event_data_type_description_t ipecamera_data_types[]; #ifdef _IPECAMERA_IMAGE_C pcilib_event_api_description_t ipecamera_image_api = { + "ipecamera", + ipecamera_init, ipecamera_free, + ipecamera_init_dma, + ipecamera_reset, ipecamera_start, ipecamera_stop, @@ -163,8 +167,7 @@ pcilib_event_api_description_t ipecamera_image_api = { ipecamera_stream, ipecamera_next_event, ipecamera_get, - ipecamera_return, - ipecamera_init_dma + ipecamera_return }; #else extern pcilib_event_api_description_t ipecamera_image_api; |