Commit 8fba22fb authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of trivial ISP2401 dependencies on header files 



On several header files, the dependency for ISP2401 is
trivial: for example, it just adds new fields on structs or
declare new functions.

Get rid of those trivial cases.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d4cf9939

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h

+10 −9
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"

#include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"

#include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"

#ifdef ISP2401

/* ISP2401 */

#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"

#endif



#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"

#include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"

#include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -47,13 +47,14 @@ enum ia_css_configuration_ids { 
	IA_CSS_OUTPUT0_CONFIG_ID,

	IA_CSS_OUTPUT1_CONFIG_ID,

	IA_CSS_OUTPUT_CONFIG_ID,

#ifdef ISP2401

	IA_CSS_SC_CONFIG_ID,

#endif

	IA_CSS_RAW_CONFIG_ID,

	IA_CSS_TNR_CONFIG_ID,

	IA_CSS_REF_CONFIG_ID,

	IA_CSS_VF_CONFIG_ID,



	/* ISP2401 */

	IA_CSS_SC_CONFIG_ID,



	IA_CSS_NUM_CONFIGURATION_IDS

};
@@ -70,9 +71,10 @@ struct ia_css_config_memory_offsets { 
		struct ia_css_isp_parameter output0;

		struct ia_css_isp_parameter output1;

		struct ia_css_isp_parameter output;

#ifdef ISP2401



		/* ISP2401 */

		struct ia_css_isp_parameter sc;

#endif



		struct ia_css_isp_parameter raw;

		struct ia_css_isp_parameter tnr;

		struct ia_css_isp_parameter ref;
@@ -149,7 +151,7 @@ ia_css_configure_output( 


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



#ifdef ISP2401

/* ISP2401 */

void

ia_css_configure_sc(

    const struct ia_css_binary *binary,
@@ -157,7 +159,6 @@ ia_css_configure_sc( 


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



#endif

void

ia_css_configure_raw(

    const struct ia_css_binary *binary,

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h

+2 −7
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ struct ia_css_memory_offsets { 
		struct ia_css_isp_parameter sdis_vertcoef;

		struct ia_css_isp_parameter sdis2_horicoef;

		struct ia_css_isp_parameter sdis2_vertcoef;

#ifdef ISP2401



		/* ISP2401 */

		struct ia_css_isp_parameter xnr3;

#endif

	} vmem;

	struct {

		struct ia_css_isp_parameter bh;
@@ -382,18 +382,13 @@ void 
ia_css_get_configs(struct ia_css_isp_parameters *params,

		   const struct ia_css_isp_config *config)

;

#ifdef ISP2401



#endif

/* Code generated by genparam/gencode.c:gen_global_access_function() */



void

ia_css_set_configs(struct ia_css_isp_parameters *params,

		   const struct ia_css_isp_config *config)

;

#ifdef ISP2401



#endif

#endif /* IA_CSS_INCLUDE_PARAMETER */



#endif /* _IA_CSS_ISP_PARAM_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h

+11 −9
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 
#include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"

#include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"

#include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"

#ifdef ISP2401



/* ISP2401 */

#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"

#endif



#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"

#include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"

#include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -47,13 +48,14 @@ enum ia_css_configuration_ids { 
	IA_CSS_OUTPUT0_CONFIG_ID,

	IA_CSS_OUTPUT1_CONFIG_ID,

	IA_CSS_OUTPUT_CONFIG_ID,

#ifdef ISP2401

	IA_CSS_SC_CONFIG_ID,

#endif

	IA_CSS_RAW_CONFIG_ID,

	IA_CSS_TNR_CONFIG_ID,

	IA_CSS_REF_CONFIG_ID,

	IA_CSS_VF_CONFIG_ID,



	/* ISP 2401 */

	IA_CSS_SC_CONFIG_ID,



	IA_CSS_NUM_CONFIGURATION_IDS

};
@@ -70,9 +72,10 @@ struct ia_css_config_memory_offsets { 
		struct ia_css_isp_parameter output0;

		struct ia_css_isp_parameter output1;

		struct ia_css_isp_parameter output;

#ifdef ISP2401



		/* ISP2401 */

		struct ia_css_isp_parameter sc;

#endif



		struct ia_css_isp_parameter raw;

		struct ia_css_isp_parameter tnr;

		struct ia_css_isp_parameter ref;
@@ -149,7 +152,7 @@ ia_css_configure_output( 


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



#ifdef ISP2401

/* ISP2401 */

void

ia_css_configure_sc(

    const struct ia_css_binary *binary,
@@ -157,7 +160,6 @@ ia_css_configure_sc( 


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



#endif

void

ia_css_configure_raw(

    const struct ia_css_binary *binary,

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h

+2 −7
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ struct ia_css_memory_offsets { 
		struct ia_css_isp_parameter sdis_vertcoef;

		struct ia_css_isp_parameter sdis2_horicoef;

		struct ia_css_isp_parameter sdis2_vertcoef;

#ifdef ISP2401



		/* ISP2401 */

		struct ia_css_isp_parameter xnr3;

#endif

	} vmem;

	struct {

		struct ia_css_isp_parameter bh;
@@ -382,18 +382,13 @@ void 
ia_css_get_configs(struct ia_css_isp_parameters *params,

		   const struct ia_css_isp_config *config)

;

#ifdef ISP2401



#endif

/* Code generated by genparam/gencode.c:gen_global_access_function() */



void

ia_css_set_configs(struct ia_css_isp_parameters *params,

		   const struct ia_css_isp_config *config)

;

#ifdef ISP2401



#endif

#endif /* IA_CSS_INCLUDE_PARAMETER */



#endif /* _IA_CSS_ISP_PARAM_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h

+8 −7
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 
#include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"

#include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"

#include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"

#ifdef ISP2401



/* ISP2401 */

#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"

#endif



#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"

#include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"

#include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -47,13 +48,14 @@ enum ia_css_configuration_ids { 
	IA_CSS_OUTPUT0_CONFIG_ID,

	IA_CSS_OUTPUT1_CONFIG_ID,

	IA_CSS_OUTPUT_CONFIG_ID,

#ifdef ISP2401

	IA_CSS_SC_CONFIG_ID,

#endif

	IA_CSS_RAW_CONFIG_ID,

	IA_CSS_TNR_CONFIG_ID,

	IA_CSS_REF_CONFIG_ID,

	IA_CSS_VF_CONFIG_ID,



	/* ISP2401 */

	IA_CSS_SC_CONFIG_ID,



	IA_CSS_NUM_CONFIGURATION_IDS

};
@@ -149,7 +151,7 @@ ia_css_configure_output( 


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



#ifdef ISP2401

/* ISP2401 */

void

ia_css_configure_sc(

    const struct ia_css_binary *binary,
@@ -157,7 +159,6 @@ ia_css_configure_sc( 


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



#endif

void

ia_css_configure_raw(

    const struct ia_css_binary *binary,