diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-12-12 15:27:13 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-12-12 15:27:13 +0100 |
| commit | d2dc73cab5b1c08822ce0066251e362f01525f10 (patch) | |
| tree | 7ee30f3670a1df1d2acd0b84e64e8f3fdf7b47a3 /ipecamera/private.h | |
| parent | d1a0a2e0322e6c5b05ba7817c1c0405dc20e5414 (diff) | |
| download | ipecamera-d2dc73cab5b1c08822ce0066251e362f01525f10.tar.gz ipecamera-d2dc73cab5b1c08822ce0066251e362f01525f10.tar.bz2 ipecamera-d2dc73cab5b1c08822ce0066251e362f01525f10.tar.xz ipecamera-d2dc73cab5b1c08822ce0066251e362f01525f10.zip | |
Minor fixes and improvements
Diffstat (limited to 'ipecamera/private.h')
| -rw-r--r-- | ipecamera/private.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipecamera/private.h b/ipecamera/private.h index 3661cbe..e15d6ba 100644 --- a/ipecamera/private.h +++ b/ipecamera/private.h @@ -7,7 +7,7 @@ #define IPECAMERA_BUG_MULTIFRAME_PACKETS #define IPECAMERA_BUG_INCOMPLETE_PACKETS -#define IPECAMERA_DEFAULT_BUFFER_SIZE 64 //**< should be power of 2 */ +#define IPECAMERA_DEFAULT_BUFFER_SIZE 16//64 //**< should be power of 2 */ #define IPECAMERA_RESERVE_BUFFERS 2 //**< Return Frame is Lost error, if requested frame will be overwritten after specified number of frames #define IPECAMERA_SLEEP_TIME 250000 //**< Michele thinks 250 should be enough, but reset failing in this case */ #define IPECAMERA_NEXT_FRAME_DELAY 1000 //**< Michele requires 30000 to sync between End Of Readout and next Frame Req */ @@ -62,7 +62,7 @@ struct ipecamera_s { pcilib_event_callback_t cb; void *cb_user; - pcilib_event_id_t event_id; + volatile pcilib_event_id_t event_id; pcilib_event_id_t preproc_id; pcilib_event_id_t reported_id; @@ -70,7 +70,7 @@ struct ipecamera_s { pcilib_register_t packet_len_reg; pcilib_register_t control_reg, status_reg; - pcilib_register_t start_reg, end_reg; + pcilib_register_t status3_reg; pcilib_register_t n_lines_reg; uint16_t line_reg; pcilib_register_t exposure_reg; @@ -87,6 +87,7 @@ struct ipecamera_s { ipecamera_autostop_t autostop; struct timeval autostop_time; + struct timeval next_trigger; /**< The minimal delay between trigger signals is mandatory, this indicates time when next trigger is possible */ size_t buffer_size; /**< How many images to store */ size_t buffer_pos; /**< Current image offset in the buffer, due to synchronization reasons should not be used outside of reader_thread */ |