summaryrefslogtreecommitdiffstats
path: root/src/cameras
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias@ipepdvpc2>2011-03-07 08:57:42 +0100
committerMatthias Vogelgesang <matthias@ipepdvpc2>2011-03-07 08:57:42 +0100
commitad1d96f2d0771d8657da40c80eea8703111a9e80 (patch)
treeb7347f0063efbad71d26f72bf5b4dd84502c489a /src/cameras
parentd3276429e07d120b5c18a66d9c6315f5fdf6c254 (diff)
downloaduca-ad1d96f2d0771d8657da40c80eea8703111a9e80.tar.gz
uca-ad1d96f2d0771d8657da40c80eea8703111a9e80.tar.bz2
uca-ad1d96f2d0771d8657da40c80eea8703111a9e80.tar.xz
uca-ad1d96f2d0771d8657da40c80eea8703111a9e80.zip
Specific error return codes for grabbers and cameras
Diffstat (limited to 'src/cameras')
-rw-r--r--src/cameras/pco.c4
-rw-r--r--src/cameras/pf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cameras/pco.c b/src/cameras/pco.c
index 45d0f62..ff2daff 100644
--- a/src/cameras/pco.c
+++ b/src/cameras/pco.c
@@ -202,12 +202,12 @@ uint32_t uca_pco_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber)
struct pco_edge_t *pco = pco_init();
if (pco == NULL) {
- return UCA_ERR_INIT_NOT_FOUND;
+ return UCA_ERR_CAM_NOT_FOUND;
}
if ((pco->serial_ref == NULL) || !pco_is_active(pco)) {
pco_destroy(pco);
- return UCA_ERR_INIT_NOT_FOUND;
+ return UCA_ERR_CAM_NOT_FOUND;
}
struct uca_camera_t *uca = (struct uca_camera_t *) malloc(sizeof(struct uca_camera_t));
diff --git a/src/cameras/pf.c b/src/cameras/pf.c
index 76d903f..e31e882 100644
--- a/src/cameras/pf.c
+++ b/src/cameras/pf.c
@@ -171,10 +171,10 @@ uint32_t uca_pf_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber)
{
int num_ports;
if (pfPortInit(&num_ports) < 0)
- return UCA_ERR_INIT_NOT_FOUND;
+ return UCA_ERR_CAM_NOT_FOUND;
if (pfDeviceOpen(0) < 0)
- return UCA_ERR_INIT_NOT_FOUND;
+ return UCA_ERR_CAM_NOT_FOUND;
/* We could check if a higher baud rate is supported, but... forget about
* it. We don't need high speed configuration. */