summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@dside.dyndns.org>2013-07-16 15:48:58 +0200
committerSuren A. Chilingaryan <csa@dside.dyndns.org>2013-07-16 15:48:58 +0200
commitd6d49cbdb2ccd7a09ec6103f1a221651368ad357 (patch)
tree2b3c98c955f39e0ecd4f790e342e3a928a1b2e66
parent09a6aa6efc8657fddc29b160e7c350091404940f (diff)
downloadipecamera-d6d49cbdb2ccd7a09ec6103f1a221651368ad357.tar.gz
ipecamera-d6d49cbdb2ccd7a09ec6103f1a221651368ad357.tar.bz2
ipecamera-d6d49cbdb2ccd7a09ec6103f1a221651368ad357.tar.xz
ipecamera-d6d49cbdb2ccd7a09ec6103f1a221651368ad357.zip
Support 4MPix sensor in IPECamera
-rw-r--r--ipecamera/private.h3
-rw-r--r--ipecamera/reader.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ipecamera/private.h b/ipecamera/private.h
index e43c98b..0f62d5a 100644
--- a/ipecamera/private.h
+++ b/ipecamera/private.h
@@ -19,7 +19,8 @@
#define IPECAMERA_NOFRAME_SLEEP 100
#define IPECAMERA_NOFRAME_PREPROC_SLEEP 100
-#define IPECAMERA_MAX_LINES 1088
+//#define IPECAMERA_MAX_LINES 1088
+#define IPECAMERA_MAX_LINES 2048
#define IPECAMERA_EXPECTED_STATUS_4 0x08409FFFF
#define IPECAMERA_EXPECTED_STATUS 0x08449FFFF
diff --git a/ipecamera/reader.c b/ipecamera/reader.c
index c11bb9d..af99fb5 100644
--- a/ipecamera/reader.c
+++ b/ipecamera/reader.c
@@ -129,7 +129,7 @@ static int ipecamera_data_callback(void *user, pcilib_dma_flags_t flags, size_t
#endif /* IPECAMERA_DEBUG_RAW_PACKETS */
if (invalid_frame_id != ctx->event_id) {
- pcilib_warning("Invalid DMA packets received, first is %u bytes long, current event %lu", bufsize, ctx->event_id);
+ pcilib_warning("No frame magic in DMA packet of %u bytes, current event %lu", bufsize, ctx->event_id);
invalid_frame_id = ctx->event_id;
}