diff options
Diffstat (limited to 'camera/mm-camera-interface/mm_camera_interface2.c')
| -rwxr-xr-x | camera/mm-camera-interface/mm_camera_interface2.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/camera/mm-camera-interface/mm_camera_interface2.c b/camera/mm-camera-interface/mm_camera_interface2.c index f6ccca9..0d46afb 100755 --- a/camera/mm-camera-interface/mm_camera_interface2.c +++ b/camera/mm-camera-interface/mm_camera_interface2.c @@ -1,5 +1,5 @@ /* -Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. +Copyright (c) 2011-2012,2015, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -181,24 +181,6 @@ static int32_t mm_camera_cfg_request_buf(mm_camera_t * camera, return rc; } -static int32_t mm_camera_cfg_enqueue_buf(mm_camera_t * camera, - mm_camera_reg_buf_t *buf) -{ - int32_t rc = -MM_CAMERA_E_GENERAL; - uint32_t tmp; - mm_camera_obj_t * my_obj = NULL; - - pthread_mutex_lock(&g_mutex); - my_obj = g_cam_ctrl.cam_obj[camera->camera_info.camera_id]; - pthread_mutex_unlock(&g_mutex); - if(my_obj) { - pthread_mutex_lock(&my_obj->mutex); - rc = mm_camera_enqueue_buf(my_obj, buf); - pthread_mutex_unlock(&my_obj->mutex); - } - return rc; -} - static int32_t mm_camera_cfg_prepare_buf(mm_camera_t * camera, mm_camera_reg_buf_t *buf) { @@ -240,7 +222,6 @@ static mm_camera_config_t mm_camera_cfg = { .set_parm = mm_camera_cfg_set_parm, .get_parm = mm_camera_cfg_get_parm, .request_buf = mm_camera_cfg_request_buf, - .enqueue_buf = mm_camera_cfg_enqueue_buf, .prepare_buf = mm_camera_cfg_prepare_buf, .unprepare_buf = mm_camera_cfg_unprepare_buf }; @@ -799,17 +780,6 @@ int32_t cam_config_request_buf(int cam_id, mm_camera_reg_buf_t *buf) return rc; } -int32_t cam_config_enqueue_buf(int cam_id, mm_camera_reg_buf_t *buf) -{ - - int32_t rc = -1; - mm_camera_t * mm_cam = get_camera_by_id(cam_id); - if (mm_cam) { - rc = mm_cam->cfg->enqueue_buf(mm_cam, buf); - } - return rc; -} - int32_t cam_config_prepare_buf(int cam_id, mm_camera_reg_buf_t *buf) { |