summaryrefslogtreecommitdiffstats
path: root/src/grabbers
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-03-24 15:09:01 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-03-24 15:09:01 +0100
commit922c36f1b6e7fc08abd5fc073c16cc9bad114880 (patch)
tree4d3e0c80ebf976e98c4749e289e328a6ce7204fe /src/grabbers
parentf7801334cc8e261aec976cc146251ddf6d9592fa (diff)
downloaduca-922c36f1b6e7fc08abd5fc073c16cc9bad114880.tar.gz
uca-922c36f1b6e7fc08abd5fc073c16cc9bad114880.tar.bz2
uca-922c36f1b6e7fc08abd5fc073c16cc9bad114880.tar.xz
uca-922c36f1b6e7fc08abd5fc073c16cc9bad114880.zip
Minor cleanups like sharing of uca_set_void and making non-exported functions
static
Diffstat (limited to 'src/grabbers')
-rw-r--r--src/grabbers/me4.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/grabbers/me4.c b/src/grabbers/me4.c
index 6d20a71..1c63f1a 100644
--- a/src/grabbers/me4.c
+++ b/src/grabbers/me4.c
@@ -50,7 +50,7 @@ static struct uca_sisofg_map_t uca_to_fg[] = {
#define GET_FG(grabber) (((struct fg_apc_data *) grabber->user)->fg)
#define GET_MEM(grabber) (((struct fg_apc_data *) grabber->user)->mem)
-uint32_t uca_me4_destroy(struct uca_grabber *grabber)
+static uint32_t uca_me4_destroy(struct uca_grabber *grabber)
{
if (grabber != NULL) {
Fg_FreeMemEx(GET_FG(grabber), GET_MEM(grabber));
@@ -83,7 +83,7 @@ static struct uca_sisofg_map_t *uca_me4_find_uca_property(int fg_id)
return NULL;
}
-uint32_t uca_me4_set_property(struct uca_grabber *grabber, int32_t property, void *data)
+static uint32_t uca_me4_set_property(struct uca_grabber *grabber, int32_t property, void *data)
{
/* Handle all properties not related specifically to the me4 */
union uca_value *v = (union uca_value *) data;
@@ -121,7 +121,7 @@ uint32_t uca_me4_set_property(struct uca_grabber *grabber, int32_t property, voi
UCA_NO_ERROR : err | UCA_ERR_INVALID;
}
-uint32_t uca_me4_get_property(struct uca_grabber *grabber, int32_t property, void *data)
+static uint32_t uca_me4_get_property(struct uca_grabber *grabber, int32_t property, void *data)
{
switch (property) {
case UCA_PROP_GRAB_SYNCHRONOUS:
@@ -155,7 +155,7 @@ uint32_t uca_me4_get_property(struct uca_grabber *grabber, int32_t property, voi
UCA_NO_ERROR : err | UCA_ERR_INVALID;
}
-uint32_t uca_me4_alloc(struct uca_grabber *grabber, uint32_t pixel_size, uint32_t n_buffers)
+static uint32_t uca_me4_alloc(struct uca_grabber *grabber, uint32_t pixel_size, uint32_t n_buffers)
{
dma_mem *mem = GET_MEM(grabber);
/* If buffers are already allocated, we are freeing every buffer and start
@@ -175,7 +175,7 @@ uint32_t uca_me4_alloc(struct uca_grabber *grabber, uint32_t pixel_size, uint32_
return UCA_ERR_GRABBER | UCA_ERR_NO_MEMORY;
}
-uint32_t uca_me4_acquire(struct uca_grabber *grabber, int32_t n_frames)
+static uint32_t uca_me4_acquire(struct uca_grabber *grabber, int32_t n_frames)
{
if (GET_MEM(grabber) == NULL)
return UCA_ERR_GRABBER | UCA_ERR_NO_MEMORY;
@@ -187,7 +187,7 @@ uint32_t uca_me4_acquire(struct uca_grabber *grabber, int32_t n_frames)
return UCA_ERR_GRABBER | UCA_ERR_ACQUIRE;
}
-uint32_t uca_me4_stop_acquire(struct uca_grabber *grabber)
+static uint32_t uca_me4_stop_acquire(struct uca_grabber *grabber)
{
if (GET_MEM(grabber) != NULL)
if (Fg_stopAcquireEx(GET_FG(grabber), 0, GET_MEM(grabber), STOP_SYNC) != FG_OK)
@@ -195,7 +195,7 @@ uint32_t uca_me4_stop_acquire(struct uca_grabber *grabber)
return UCA_NO_ERROR;
}
-uint32_t uca_me4_grab(struct uca_grabber *grabber, void **buffer, uint64_t *frame_number)
+static uint32_t uca_me4_grab(struct uca_grabber *grabber, void **buffer, uint64_t *frame_number)
{
static frameindex_t last_frame = 0;
struct fg_apc_data *me4 = (struct fg_apc_data *) grabber->user;
@@ -219,7 +219,7 @@ static int uca_me4_callback(frameindex_t frame, struct fg_apc_data *apc)
return 0;
}
-uint32_t uca_me4_register_callback(struct uca_grabber *grabber, uca_cam_grab_callback callback, void *meta_data, void *user)
+static uint32_t uca_me4_register_callback(struct uca_grabber *grabber, uca_cam_grab_callback callback, void *meta_data, void *user)
{
if (GET_MEM(grabber) == NULL)
return UCA_ERR_GRABBER | UCA_ERR_CALLBACK | UCA_ERR_NO_MEMORY;