Commit 977e77c0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: make sh_css_struct.h independent of ISP version

Use the same struct for both ISP2400 and ISP2401.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ffa12361
...@@ -42,16 +42,17 @@ struct sh_css { ...@@ -42,16 +42,17 @@ struct sh_css {
struct ia_css_pipe *all_pipes[IA_CSS_PIPELINE_NUM_MAX]; struct ia_css_pipe *all_pipes[IA_CSS_PIPELINE_NUM_MAX];
void *(*malloc)(size_t bytes, bool zero_mem); void *(*malloc)(size_t bytes, bool zero_mem);
void (*free)(void *ptr); void (*free)(void *ptr);
#ifdef ISP2401 void (*flush)(struct ia_css_acc_fw *fw);
/* ISP2401 */
void *(*malloc_ex)(size_t bytes, bool zero_mem, const char *caller_func, void *(*malloc_ex)(size_t bytes, bool zero_mem, const char *caller_func,
int caller_line); int caller_line);
void (*free_ex)(void *ptr, const char *caller_func, int caller_line); void (*free_ex)(void *ptr, const char *caller_func, int caller_line);
#endif
void (*flush)(struct ia_css_acc_fw *fw); /* ISP2400 */
bool check_system_idle;
#ifndef ISP2401
bool stop_copy_preview; bool stop_copy_preview;
#endif
bool check_system_idle;
unsigned int num_cont_raw_frames; unsigned int num_cont_raw_frames;
#if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) #if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401)
unsigned int num_mipi_frames[N_CSI_PORTS]; unsigned int num_mipi_frames[N_CSI_PORTS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment