Commit 32efca3d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: move ia_css_configure_sc() implementation 



With the changes, this function is now undefined if built
for ISP2400. So, move its implementation to the file which
calls it.

Reported-by: default avatarFrancescodario Cuzzocrea <francescodario.cuzzocrea@mail.polimi.it>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8ac17140

drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c

+0 −27
Original line number Diff line number Diff line
@@ -272,33 +272,6 @@ ia_css_configure_output( 
			    "ia_css_configure_output() leave:\n");

}



/* Code generated by genparam/genconfig.c:gen_configure_function() */



void

ia_css_configure_sc(

    const struct ia_css_binary *binary,

    const struct ia_css_sc_configuration *config_dmem)

{

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_configure_sc() enter:\n");



	{

		unsigned int offset = 0;

		unsigned int size   = 0;



		if (binary->info->mem_offsets.offsets.config) {

			size   = binary->info->mem_offsets.offsets.config->dmem.sc.size;

			offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset;

		}

		if (size) {

			ia_css_sc_config((struct sh_css_isp_sc_isp_config *)

					 &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],

					 config_dmem, size);

		}

	}

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_configure_sc() leave:\n");

}



/* Code generated by genparam/genconfig.c:gen_configure_function() */

drivers/staging/media/atomisp/pci/ia_css_isp_configs.h

+0 −8
Original line number Diff line number Diff line
@@ -152,14 +152,6 @@ ia_css_configure_output( 


/* Code generated by genparam/genconfig.c:gen_configure_function() */



/* ISP2401 */

void

ia_css_configure_sc(

    const struct ia_css_binary *binary,

    const struct ia_css_sc_configuration *config_dmem);



/* Code generated by genparam/genconfig.c:gen_configure_function() */



void

ia_css_configure_raw(

    const struct ia_css_binary *binary,

drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c

+29 −0
Original line number Diff line number Diff line
@@ -22,6 +22,35 @@ 


#include "ia_css_sc.host.h"



/* Code generated by genparam/genconfig.c:gen_configure_function() */



/* ISP2401 */

static void

ia_css_configure_sc(

    const struct ia_css_binary *binary,

    const struct ia_css_sc_configuration *config_dmem)

{

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_configure_sc() enter:\n");



	{

		unsigned int offset = 0;

		unsigned int size   = 0;



		if (binary->info->mem_offsets.offsets.config) {

			size   = binary->info->mem_offsets.offsets.config->dmem.sc.size;

			offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset;

		}

		if (size) {

			ia_css_sc_config((struct sh_css_isp_sc_isp_config *)

					 &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],

					 config_dmem, size);

		}

	}

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_configure_sc() leave:\n");

}



void

ia_css_sc_encode(

    struct sh_css_isp_sc_params *to,

CRA Git | Maintained and supported by SUSTech CRA and CCSE