diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-04-11 16:04:13 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-04-11 16:04:13 +0200 |
| commit | ecb5c3617140852dbd57cc3a77a5fe3dfaf2ed6f (patch) | |
| tree | 70473a3f3436c42882fd3148baea563da91f8506 | |
| parent | a7faef63d55ba76fd8bd0f6ae6c403f94e3fe58c (diff) | |
| parent | 27b15ff356f1abd38304e8bbd0abdd1faf04c4e9 (diff) | |
| download | libuca-ecb5c3617140852dbd57cc3a77a5fe3dfaf2ed6f.tar.gz libuca-ecb5c3617140852dbd57cc3a77a5fe3dfaf2ed6f.tar.bz2 libuca-ecb5c3617140852dbd57cc3a77a5fe3dfaf2ed6f.tar.xz libuca-ecb5c3617140852dbd57cc3a77a5fe3dfaf2ed6f.zip | |
Merge pending change
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/cameras/ipe.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a3f307d..39f4ce7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,8 +63,8 @@ if (IPE_FOUND) option(HAVE_IPE_CAMERA "Camera: Custom IPE based on Xilinx FPGA" ON) if (HAVE_IPE_CAMERA) - set(uca_SRC ${uca_SRCS} cameras/ipe.c) - set(uca_LIB ${uca_LIBS} ${IPE_LIBRARIES}) + set(uca_SRCS ${uca_SRCS} cameras/ipe.c) + set(uca_LIBS ${uca_LIBS} ${IPE_LIBRARIES}) include_directories(${IPE_INCLUDE_DIRS}) endif() diff --git a/src/cameras/ipe.c b/src/cameras/ipe.c index 45a619c..1032f54 100644 --- a/src/cameras/ipe.c +++ b/src/cameras/ipe.c @@ -73,7 +73,7 @@ static uint32_t uca_ipe_get_property(struct uca_camera *cam, enum uca_property_i break; default: - return UCA_ERR_PROP_INVALID; + return UCA_ERR_CAMERA | UCA_ERR_PROP | UCA_ERR_INVALID; } return UCA_NO_ERROR; } @@ -100,7 +100,7 @@ static uint32_t uca_ipe_register_callback(struct uca_camera *cam, uca_cam_grab_c cam->callback_user = user; return UCA_NO_ERROR; } - return UCA_ERR_GRABBER_CALLBACK_ALREADY_REGISTERED; + return UCA_ERR_CAMERA | UCA_ERR_CALLBACK | UCA_ERR_ALREADY_REGISTERED; } static uint32_t uca_ipe_destroy(struct uca_camera *cam) @@ -114,7 +114,7 @@ uint32_t uca_ipe_init(struct uca_camera **cam, struct uca_grabber *grabber) pcilib_model_t model = PCILIB_MODEL_DETECT; pcilib_t *handle = pcilib_open("/dev/fpga0", model); if (handle < 0) - return UCA_ERR_CAM_NOT_FOUND; + return UCA_ERR_CAMERA | UCA_ERR_INIT | UCA_ERR_NOT_FOUND; pcilib_set_error_handler(&uca_ipe_handle_error, &uca_ipe_handle_error); model = pcilib_get_model(handle); |