summaryrefslogtreecommitdiffstats
path: root/src/cameras
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-02-03 16:14:18 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-02-03 16:14:18 +0100
commit85546868f4df692803d21ddbaa20673fd8b5be0b (patch)
tree8a8079c69adf483b6ab2dd435faf1ba72191287c /src/cameras
parent0da06d904850330f583e1e8cdededcf6aa8cbe29 (diff)
downloaduca-85546868f4df692803d21ddbaa20673fd8b5be0b.tar.gz
uca-85546868f4df692803d21ddbaa20673fd8b5be0b.tar.bz2
uca-85546868f4df692803d21ddbaa20673fd8b5be0b.tar.xz
uca-85546868f4df692803d21ddbaa20673fd8b5be0b.zip
Typedef types
Diffstat (limited to 'src/cameras')
-rw-r--r--src/cameras/pco.c4
-rw-r--r--src/cameras/pf.c6
-rw-r--r--src/cameras/simple.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/cameras/pco.c b/src/cameras/pco.c
index 2e02dfe..4510fa6 100644
--- a/src/cameras/pco.c
+++ b/src/cameras/pco.c
@@ -71,7 +71,7 @@ static uint32_t uca_pco_destroy(struct uca_camera_priv *cam)
return UCA_NO_ERROR;
}
-static uint32_t uca_pco_set_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data)
+static uint32_t uca_pco_set_property(struct uca_camera_priv *cam, uca_property_ids property, void *data)
{
struct uca_grabber_priv *grabber = cam->grabber;
struct pco_desc *pco_d = GET_PCO_DESC(cam);
@@ -144,7 +144,7 @@ static uint32_t uca_pco_set_property(struct uca_camera_priv *cam, enum uca_prope
}
-static uint32_t uca_pco_get_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data, size_t num)
+static uint32_t uca_pco_get_property(struct uca_camera_priv *cam, uca_property_ids property, void *data, size_t num)
{
pco_handle pco = GET_PCO(cam);
struct uca_grabber_priv *grabber = cam->grabber;
diff --git a/src/cameras/pf.c b/src/cameras/pf.c
index 1812aaf..829b94a 100644
--- a/src/cameras/pf.c
+++ b/src/cameras/pf.c
@@ -24,7 +24,7 @@
#include "uca-grabber.h"
struct uca_pf_map {
- enum uca_property_ids uca_prop;
+ uca_property_ids uca_prop;
const char *pf_prop;
};
@@ -63,7 +63,7 @@ static int uca_pf_set_uint32_property(TOKEN token, void *data, uint32_t *update_
return pfDevice_SetProperty(0, token, &value);
}
-static uint32_t uca_pf_set_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data)
+static uint32_t uca_pf_set_property(struct uca_camera_priv *cam, uca_property_ids property, void *data)
{
struct uca_grabber_priv *grabber = cam->grabber;
TOKEN token = INVALID_TOKEN;
@@ -121,7 +121,7 @@ static uint32_t uca_pf_set_property(struct uca_camera_priv *cam, enum uca_proper
}
-static uint32_t uca_pf_get_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data, size_t num)
+static uint32_t uca_pf_get_property(struct uca_camera_priv *cam, uca_property_ids property, void *data, size_t num)
{
TOKEN t; /* You gotta love developers who name types capitalized... */
PFValue value;
diff --git a/src/cameras/simple.c b/src/cameras/simple.c
index 368eb62..9b8be9a 100644
--- a/src/cameras/simple.c
+++ b/src/cameras/simple.c
@@ -23,7 +23,7 @@
#include "uca-grabber.h"
-static uint32_t uca_simple_set_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data)
+static uint32_t uca_simple_set_property(struct uca_camera_priv *cam, uca_property_ids property, void *data)
{
struct uca_grabber_priv *grabber = cam->grabber;
int err = UCA_NO_ERROR;
@@ -43,7 +43,7 @@ static uint32_t uca_simple_set_property(struct uca_camera_priv *cam, enum uca_pr
}
-static uint32_t uca_simple_get_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data, size_t num)
+static uint32_t uca_simple_get_property(struct uca_camera_priv *cam, uca_property_ids property, void *data, size_t num)
{
struct uca_grabber_priv *grabber = cam->grabber;
uint32_t value32 = 0;