package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 09:06:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mpi]: fix -Wstrict-prototypes warning

Browse Source 
Change-Id: If9549b213c6b5d5545186e1289a436957160924f
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2016-09-14 16:05:47 +08:00
parent 65df276a8d
commit 1752473f33
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/rk_mpi.h
View File

@@ -269,7 +269,7 @@ MPP_RET mpp_destroy(MppCtx ctx);
// coding type format function // coding type format function
MPP_RET mpp_check_support_format(MppCtxType type, MppCodingType coding); MPP_RET mpp_check_support_format(MppCtxType type, MppCodingType coding);
void mpp_show_support_format(); void mpp_show_support_format(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
inc/vpu_api.h
View File

@@ -373,7 +373,7 @@ extern "C"
/* /*
* vpu memory handle interface * vpu memory handle interface
*/ */
RK_S32 VPUMemJudgeIommu(); RK_S32 VPUMemJudgeIommu(void);
RK_S32 VPUMallocLinear(VPUMemLinear_t *p, RK_U32 size); RK_S32 VPUMallocLinear(VPUMemLinear_t *p, RK_U32 size);
RK_S32 VPUFreeLinear(VPUMemLinear_t *p); RK_S32 VPUFreeLinear(VPUMemLinear_t *p);
RK_S32 VPUMemDuplicate(VPUMemLinear_t *dst, VPUMemLinear_t *src); RK_S32 VPUMemDuplicate(VPUMemLinear_t *dst, VPUMemLinear_t *src);

6
mpp/hal/vpu/jpege/hal_jpege_api.c
View File

@@ -326,17 +326,17 @@ MPP_RET hal_jpege_start(void *hal, HalTaskInfo *task)
{ {
MPP_RET ret = MPP_OK; MPP_RET ret = MPP_OK;
HalJpegeCtx *ctx = (HalJpegeCtx *)hal; HalJpegeCtx *ctx = (HalJpegeCtx *)hal;
RK_U32 *regs = ctx->regs;
(void)task;
hal_jpege_dbg_func("enter hal %p\n", hal); hal_jpege_dbg_func("enter hal %p\n", hal);
#ifdef RKPLATFORM #ifdef RKPLATFORM
if (ctx->vpu_fd >= 0) if (ctx->vpu_fd >= 0)
ret = VPUClientSendReg(ctx->vpu_fd, regs, VPU2_REG_NUM); ret = VPUClientSendReg(ctx->vpu_fd, ctx->regs, VPU2_REG_NUM);
#endif #endif
hal_jpege_dbg_func("leave hal %p\n", hal); hal_jpege_dbg_func("leave hal %p\n", hal);
(void)ctx;
(void)task;
return ret; return ret;
} }

16
mpp/hal/vpu/mpg4d/hal_mpg4d_reg.c
View File

@@ -15,16 +15,6 @@
* limitations under the License. * limitations under the License.
*/ */
/*
* @file hal_vpu_mpg4d_reg.c
* @brief
* @author gzl(lance.gao@rock-chips.com)
* @version 1.0.0
* @history
* 2016.04.11 : Create
*/
#define MODULE_TAG "hal_vpu_mpg4d" #define MODULE_TAG "hal_vpu_mpg4d"
#include <stdio.h> #include <stdio.h>
@@ -453,9 +443,9 @@ MPP_RET hal_vpu_mpg4d_gen_regs(void *hal, HalTaskInfo *syn)
MPP_RET hal_vpu_mpg4d_start(void *hal, HalTaskInfo *task) MPP_RET hal_vpu_mpg4d_start(void *hal, HalTaskInfo *task)
{ {
MPP_RET ret = MPP_OK; MPP_RET ret = MPP_OK;
hal_mpg4_ctx *ctx = (hal_mpg4_ctx *)hal;
#ifdef RKPLATFORM #ifdef RKPLATFORM
hal_mpg4_ctx *ctx = (hal_mpg4_ctx *)hal;
RK_U32 reg_count = (sizeof(*ctx->regs) / sizeof(RK_U32)); RK_U32 reg_count = (sizeof(*ctx->regs) / sizeof(RK_U32));
RK_U32* regs = (RK_U32 *)ctx->regs; RK_U32* regs = (RK_U32 *)ctx->regs;
@@ -469,6 +459,7 @@ MPP_RET hal_vpu_mpg4d_start(void *hal, HalTaskInfo *task)
ret = VPUClientSendReg(ctx->vpu_fd, regs, reg_count); ret = VPUClientSendReg(ctx->vpu_fd, regs, reg_count);
#endif #endif
(void)ret; (void)ret;
(void)hal;
(void)task; (void)task;
return ret; return ret;
} }
@@ -476,8 +467,8 @@ MPP_RET hal_vpu_mpg4d_start(void *hal, HalTaskInfo *task)
MPP_RET hal_vpu_mpg4d_wait(void *hal, HalTaskInfo *task) MPP_RET hal_vpu_mpg4d_wait(void *hal, HalTaskInfo *task)
{ {
MPP_RET ret = MPP_OK; MPP_RET ret = MPP_OK;
hal_mpg4_ctx *ctx = (hal_mpg4_ctx *)hal;
#ifdef RKPLATFORM #ifdef RKPLATFORM
hal_mpg4_ctx *ctx = (hal_mpg4_ctx *)hal;
VpuMpg4dRegSet_t reg_out; VpuMpg4dRegSet_t reg_out;
RK_U32* regs = (RK_U32 *)&reg_out; RK_U32* regs = (RK_U32 *)&reg_out;
RK_U32 reg_count = (sizeof(reg_out) / sizeof(RK_U32)); RK_U32 reg_count = (sizeof(reg_out) / sizeof(RK_U32));
@@ -496,6 +487,7 @@ MPP_RET hal_vpu_mpg4d_wait(void *hal, HalTaskInfo *task)
} }
#endif #endif
(void)ret; (void)ret;
(void)hal;
(void)task; (void)task;
return ret; return ret;
} }