Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb8833c3 authored by Pavan Kumar Chilamkurthi's avatar Pavan Kumar Chilamkurthi
Browse files

msm: camera: Enhance camera common functionality 



Add packet utility functions and other common functions
in common utility files so that other camera drivers
can re-use the functions.

Change-Id: Ib871f7dc0f31d4595439311515e7e967443c6e56
Signed-off-by: default avatarPavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
parent 36aac926

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_core_common.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ bool cam_cdm_set_cam_hw_version( 
	return false;

}



void cam_cdm_cpas_cb(int32_t client_handle, void *userdata,

void cam_cdm_cpas_cb(uint32_t client_handle, void *userdata,

	enum cam_camnoc_irq_type evt_type, uint32_t evt_data)

{

	pr_err("CPAS error callback type=%d with data=%x\n", evt_type,

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_core_common.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int cam_cdm_process_cmd(void *hw_priv, uint32_t cmd, void *cmd_args, 
	uint32_t arg_size);

bool cam_cdm_set_cam_hw_version(

	uint32_t ver, struct cam_hw_version *cam_version);

void cam_cdm_cpas_cb(int32_t client_handle, void *userdata,

void cam_cdm_cpas_cb(uint32_t client_handle, void *userdata,

	enum cam_camnoc_irq_type evt_type, uint32_t evt_data);

struct cam_cdm_utils_ops *cam_cdm_get_ops(

	uint32_t ver, struct cam_hw_version *cam_version, bool by_cam_version);

drivers/media/platform/msm/camera/cam_core/cam_context_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int cam_context_apply_req_to_hw(struct cam_context *ctx, 
	cfg.num_hw_update_entries = req->num_hw_update_entries;

	cfg.out_map_entries = req->out_map_entries;

	cfg.num_out_map_entries = req->num_out_map_entries;

	cfg.priv = (void *)&req->request_id;

	cfg.priv = req->req_priv;

	list_add_tail(&req->list, &ctx->active_req_list);



	rc = ctx->hw_mgr_intf->hw_config(ctx->hw_mgr_intf->hw_mgr_priv, &cfg);

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+1 −18
Original line number Diff line number Diff line
@@ -21,23 +21,6 @@ 
#include "cam_cpas_hw_intf.h"

#include "cam_cpas_soc.h"



int cam_cpas_util_get_string_index(const char **strings,

	uint32_t num_strings, char *matching_string, uint32_t *index)

{

	int i;



	for (i = 0; i < num_strings; i++) {

		if (strnstr(strings[i], matching_string, strlen(strings[i]))) {

			CAM_DBG(CAM_CPAS, "matched %s : %d",

				matching_string, i);

			*index = i;

			return 0;

		}

	}



	return -EINVAL;

}



int cam_cpas_util_reg_update(struct cam_hw_info *cpas_hw,

	enum cam_cpas_reg_base reg_base, struct cam_cpas_reg *reg_info)

{
@@ -1040,7 +1023,7 @@ static int cam_cpas_hw_register_client(struct cam_hw_info *cpas_hw, 


	mutex_lock(&cpas_hw->hw_mutex);



	rc = cam_cpas_util_get_string_index(soc_private->client_name,

	rc = cam_common_util_get_string_index(soc_private->client_name,

		soc_private->num_clients, client_name, &client_indx);

	if (rc || !CAM_CPAS_CLIENT_VALID(client_indx) ||

		CAM_CPAS_CLIENT_REGISTERED(cpas_core, client_indx)) {

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.h

+1 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "cam_cpas_api.h"

#include "cam_cpas_hw_intf.h"

#include "cam_common_util.h"



#define CPAS_MAX_CLIENTS 20

#define CAM_CPAS_INFLIGHT_WORKS 5
@@ -192,7 +193,5 @@ int cam_cpastop_get_internal_ops(struct cam_cpas_internal_ops *internal_ops); 


int cam_cpas_util_reg_update(struct cam_hw_info *cpas_hw,

	enum cam_cpas_reg_base reg_base, struct cam_cpas_reg *reg_info);

int cam_cpas_util_get_string_index(const char **strings,

	uint32_t num_strings, char *matching_string, uint32_t *index);



#endif /* _CAM_CPAS_HW_H_ */