summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/README1
-rw-r--r--pcilib/event.h11
-rw-r--r--pcilib/pcilib.h11
3 files changed, 12 insertions, 11 deletions
diff --git a/docs/README b/docs/README
index 647df41..ba22acf 100644
--- a/docs/README
+++ b/docs/README
@@ -8,6 +8,7 @@ Supported environmental variables
IPECAMERA_DEBUG_RAW_PACKETS - Store all raw packets read from DMA grouped in frames (variable may specify directory)
IPECAMERA_DEBUG_RAW_FRAMES - Store all raw frames (variable may specify directory)
IPECAMERA_DEBUG_HARDWARE - Produce various debugging information about ipecamera operation
+ IPECAMERA_DEBUG_FRAME_HEADERS - Print headers of each frame
PCILIB_BENCHMARK_HARDWARE - Remove all unnecessary software processing (like copying memcpy) to check hardware performance
PCILIB_BENCHMARK_STREAMING - Emulate streaming mode while benchmarking DMA engines
diff --git a/pcilib/event.h b/pcilib/event.h
index d2b9793..f14abeb 100644
--- a/pcilib/event.h
+++ b/pcilib/event.h
@@ -45,17 +45,6 @@ typedef struct {
const char *description;
} pcilib_event_data_type_description_t;
-typedef enum {
- PCILIB_STREAMING_STOP = 0, /**< stop streaming */
- PCILIB_STREAMING_CONTINUE = 1, /**< wait the default DMA timeout for a new data */
- PCILIB_STREAMING_WAIT = 2, /**< wait the specified timeout for a new data */
- PCILIB_STREAMING_CHECK = 3, /**< do not wait for the data, bail out imideatly if no data ready */
- PCILIB_STREAMING_FAIL = 4, /**< fail if data is not available on timeout */
- PCILIB_STREAMING_REQ_FRAGMENT = 5, /**< only fragment of a packet is read, wait for next fragment and fail if no data during DMA timeout */
- PCILIB_STREAMING_REQ_PACKET = 6, /**< wait for next packet and fail if no data during the specified timeout */
- PCILIB_STREAMING_TIMEOUT_MASK = 3 /**< mask specifying all timeout modes */
-} pcilib_streaming_action_t;
-
/*
* get_data: This call is used by get_data and copy_data functions of public
* interface. When copy_data is the caller, the data parameter will be passed.
diff --git a/pcilib/pcilib.h b/pcilib/pcilib.h
index 8a43bfb..01f3324 100644
--- a/pcilib/pcilib.h
+++ b/pcilib/pcilib.h
@@ -63,6 +63,17 @@ typedef enum {
} pcilib_dma_flags_t;
typedef enum {
+ PCILIB_STREAMING_STOP = 0, /**< stop streaming */
+ PCILIB_STREAMING_CONTINUE = 1, /**< wait the default DMA timeout for a new data */
+ PCILIB_STREAMING_WAIT = 2, /**< wait the specified timeout for a new data */
+ PCILIB_STREAMING_CHECK = 3, /**< do not wait for the data, bail out imideatly if no data ready */
+ PCILIB_STREAMING_FAIL = 4, /**< fail if data is not available on timeout */
+ PCILIB_STREAMING_REQ_FRAGMENT = 5, /**< only fragment of a packet is read, wait for next fragment and fail if no data during DMA timeout */
+ PCILIB_STREAMING_REQ_PACKET = 6, /**< wait for next packet and fail if no data during the specified timeout */
+ PCILIB_STREAMING_TIMEOUT_MASK = 3 /**< mask specifying all timeout modes */
+} pcilib_streaming_action_t;
+
+typedef enum {
PCILIB_EVENT_FLAGS_DEFAULT = 0,
PCILIB_EVENT_FLAG_RAW_DATA_ONLY = 1, /**< Do not parse data, just read raw and pass it to rawdata callback. If passed to rawdata callback, idicates the data is not identified as event (most probably just padding) */
PCILIB_EVENT_FLAG_STOP_ONLY = 1, /**< Do not cleanup, just stop acquiring new frames, the cleanup should be requested afterwards */