diff --git a/mpp/hal/inc/hal_jpegd_api.h b/mpp/hal/inc/hal_jpegd_api.h index 570e38ed..e66ced31 100644 --- a/mpp/hal/inc/hal_jpegd_api.h +++ b/mpp/hal/inc/hal_jpegd_api.h @@ -36,8 +36,6 @@ RK_S32 hal_jpegd_gen_regs(void *hal, HalTaskInfo *syn); RK_S32 hal_jpegd_deinit(void *hal); MPP_RET hal_jpegd_start(void *hal, HalTaskInfo *task); MPP_RET hal_jpegd_wait(void *hal, HalTaskInfo *task); -MPP_RET hal_jpegd_reset(void *hal); -MPP_RET hal_jpegd_flush(void *hal); MPP_RET hal_jpegd_control(void *hal, MpiCmd cmd_type, void *param); #ifdef __cplusplus diff --git a/mpp/hal/vpu/jpegd/hal_jpegd_api.c b/mpp/hal/vpu/jpegd/hal_jpegd_api.c index d6629097..33c85413 100644 --- a/mpp/hal/vpu/jpegd/hal_jpegd_api.c +++ b/mpp/hal/vpu/jpegd/hal_jpegd_api.c @@ -48,18 +48,6 @@ static MPP_RET hal_jpegd_wait(void *hal, HalTaskInfo *task) return self->hal_api.wait (hal, task); } -static MPP_RET hal_jpegd_reset(void *hal) -{ - JpegdHalCtx *self = (JpegdHalCtx *)hal; - return self->hal_api.reset (hal); -} - -static MPP_RET hal_jpegd_flush(void *hal) -{ - JpegdHalCtx *self = (JpegdHalCtx *)hal; - return self->hal_api.flush (hal); -} - static MPP_RET hal_jpegd_control(void *hal, MpiCmd cmd_type, void *param) { JpegdHalCtx *self = (JpegdHalCtx *)hal; @@ -126,8 +114,6 @@ static MPP_RET hal_jpegd_init(void *hal, MppHalCfg *cfg) p_api->reg_gen = hal_jpegd_vdpu2_gen_regs; p_api->start = hal_jpegd_vdpu2_start; p_api->wait = hal_jpegd_vdpu2_wait; - p_api->reset = hal_jpegd_vdpu2_reset; - p_api->flush = hal_jpegd_vdpu2_flush; p_api->control = hal_jpegd_vdpu2_control; } break; case VPU_CLIENT_VDPU1 : @@ -137,8 +123,6 @@ static MPP_RET hal_jpegd_init(void *hal, MppHalCfg *cfg) p_api->reg_gen = hal_jpegd_vdpu1_gen_regs; p_api->start = hal_jpegd_vdpu1_start; p_api->wait = hal_jpegd_vdpu1_wait; - p_api->reset = hal_jpegd_vdpu1_reset; - p_api->flush = hal_jpegd_vdpu1_flush; p_api->control = hal_jpegd_vdpu1_control; } break; case VPU_CLIENT_JPEG_DEC : { @@ -147,8 +131,6 @@ static MPP_RET hal_jpegd_init(void *hal, MppHalCfg *cfg) p_api->reg_gen = hal_jpegd_rkv_gen_regs; p_api->start = hal_jpegd_rkv_start; p_api->wait = hal_jpegd_rkv_wait; - p_api->reset = NULL; - p_api->flush = NULL; p_api->control = hal_jpegd_rkv_control; } break; default : { @@ -187,7 +169,7 @@ const MppHalApi hal_api_jpegd = { .reg_gen = hal_jpegd_reg_gen, .start = hal_jpegd_start, .wait = hal_jpegd_wait, - .reset = hal_jpegd_reset, - .flush = hal_jpegd_flush, + .reset = NULL, + .flush = NULL, .control = hal_jpegd_control, }; diff --git a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c index 96692ad1..dc8d93ff 100644 --- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c +++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c @@ -1043,25 +1043,6 @@ __SKIP_HARD: return ret; } -MPP_RET hal_jpegd_vdpu1_reset(void *hal) -{ - jpegd_dbg_func("enter\n"); - MPP_RET ret = MPP_OK; - JpegdHalCtx *JpegHalCtx = (JpegdHalCtx *)hal; - (void)JpegHalCtx; - - return ret; -} - -MPP_RET hal_jpegd_vdpu1_flush(void *hal) -{ - jpegd_dbg_func("enter\n"); - MPP_RET ret = MPP_OK; - - (void)hal; - return ret; -} - MPP_RET hal_jpegd_vdpu1_control(void *hal, MpiCmd cmd_type, void *param) { jpegd_dbg_func("enter\n"); diff --git a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.h b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.h index faffde4c..f5eb395c 100644 --- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.h +++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.h @@ -24,8 +24,6 @@ MPP_RET hal_jpegd_vdpu1_deinit(void *hal); MPP_RET hal_jpegd_vdpu1_gen_regs(void *hal, HalTaskInfo *syn); MPP_RET hal_jpegd_vdpu1_start(void *hal, HalTaskInfo *task); MPP_RET hal_jpegd_vdpu1_wait(void *hal, HalTaskInfo *task); -MPP_RET hal_jpegd_vdpu1_reset(void *hal); -MPP_RET hal_jpegd_vdpu1_flush(void *hal); MPP_RET hal_jpegd_vdpu1_control(void *hal, MpiCmd cmd_type, void *param); #endif /* __HAL_JPEGD_VDPU1_H__ */ diff --git a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c index cd98ee11..214e6bd6 100644 --- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c +++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c @@ -1010,26 +1010,6 @@ __SKIP_HARD: return ret; } -MPP_RET hal_jpegd_vdpu2_reset(void *hal) -{ - jpegd_dbg_func("enter\n"); - MPP_RET ret = MPP_OK; - JpegdHalCtx *JpegHalCtx = (JpegdHalCtx *)hal; - (void)JpegHalCtx; - - jpegd_dbg_func("exit\n"); - return ret; -} - -MPP_RET hal_jpegd_vdpu2_flush(void *hal) -{ - jpegd_dbg_func("enter\n"); - MPP_RET ret = MPP_OK; - - (void)hal; - return ret; -} - MPP_RET hal_jpegd_vdpu2_control(void *hal, MpiCmd cmd_type, void *param) { diff --git a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.h b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.h index 0cd08389..533b77aa 100644 --- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.h +++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.h @@ -23,8 +23,6 @@ MPP_RET hal_jpegd_vdpu2_deinit(void *hal); MPP_RET hal_jpegd_vdpu2_gen_regs(void *hal, HalTaskInfo *syn); MPP_RET hal_jpegd_vdpu2_start(void *hal, HalTaskInfo *task); MPP_RET hal_jpegd_vdpu2_wait(void *hal, HalTaskInfo *task); -MPP_RET hal_jpegd_vdpu2_reset(void *hal); -MPP_RET hal_jpegd_vdpu2_flush(void *hal); MPP_RET hal_jpegd_vdpu2_control(void *hal, MpiCmd cmd_type, void *param); #endif /* __HAL_JPEGD_VDPU2_H__ */