From a629ed443e50a93cbf5e114cae8bcc1a87bf0a9f Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 10 Nov 2023 10:24:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=BF=9B=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nvt_logo/nvt_display_for_fwupdate.c | 96 +++++++++---------- 1 file changed, 45 insertions(+), 51 deletions(-) diff --git a/BSP/u-boot/board/novatek/common/nvt_logo/nvt_display_for_fwupdate.c b/BSP/u-boot/board/novatek/common/nvt_logo/nvt_display_for_fwupdate.c index 47d6e9fb5..c00654e27 100755 --- a/BSP/u-boot/board/novatek/common/nvt_logo/nvt_display_for_fwupdate.c +++ b/BSP/u-boot/board/novatek/common/nvt_logo/nvt_display_for_fwupdate.c @@ -671,7 +671,7 @@ int nvt_display_decode_string(void) } jpeg_getdim(&img_width, &img_height); _Y_LOG("str6: image size: %d x %d\n", img_width, img_height); - printf("str6: image size: %d x %d\n", img_width, img_height); + //printf("str6: image size: %d x %d\n", img_width, img_height); if(g_uiStrYBufSize*2 < img_width*img_height*2) { printf("(%d,%d) size small 0x%x\r\n",img_width,img_height,g_uiStrYBufSize*2); return -1; @@ -865,7 +865,7 @@ void nvt_display_draw(UINT32 u32Id) if (!g_uiVDO2_YAddr) { g_uiPinPongIdx = 0; } - printf("u32Id:%lu\r\n", u32Id); + //printf("u32Id:%lu\r\n", u32Id); switch (u32Id) { case DISP_DRAW_INIT: @@ -948,67 +948,61 @@ void nvt_display_draw(UINT32 u32Id) case DISP_DRAW_UPDATING_BAR: // j = g_uiXBarStep*g_uiBarW + g_uiBarW; - printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu g_uiBarWtmp:%lu tmp:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp, (g_uiStr6_h - g_uiBarW)); - - if(g_uiBarWtmp < (g_uiStr6_h - g_uiBarW)) + //printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu g_uiBarWtmp:%lu tmp:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp, (g_uiStr6_h - g_uiBarW)); + g_uiXBarStep++; + g_uiBarWtmp = g_uiXBarStep*g_uiBarW; + if(g_uiBarWtmp > g_uiStr6_h) { - g_uiBarWtmp = g_uiXBarStep*g_uiBarW + g_uiBarW; - g_uiXBarStep++; + g_uiBarWtmp = g_uiStr6_h; + } + for (i=1; i <= g_uiBarWtmp; i++) { + if (g_uiRotateDir == DISP_ROTATE_0) { + g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset; + } else if (g_uiRotateDir == DISP_ROTATE_90) { + g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset; + } else if (g_uiRotateDir == DISP_ROTATE_270) { + g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset; + } - for (i=1; i <= g_uiXBarStep; i++) { - for (j = 0; j < g_uiBarWtmp; j++) { - if (g_uiRotateDir == DISP_ROTATE_0) { - g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH /*offset for next bar*/ + j*g_uiImgLineoffset; - } else if (g_uiRotateDir == DISP_ROTATE_90) { - g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX - (i-1)*g_uiBarH*g_uiImgLineoffset - j*g_uiImgLineoffset; - } else if (g_uiRotateDir == DISP_ROTATE_270) { - g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH*g_uiImgLineoffset + j*g_uiImgLineoffset; - } - - switch (g_uiPinPongIdx){ - case 0: - memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); - memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); - break; - case 1: - memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); - memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); - break; - } - } + switch (g_uiPinPongIdx){ + case 0: + memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); + memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); + break; + case 1: + memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); + memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); + break; } } - break; case DISP_DRAW_UPDATEFW_OK: - printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu j:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp); - for (i=1; i <= g_uiXBarStep; i++) { - for (j = 0; j < g_uiBarWtmp; j++) { - if (g_uiRotateDir == DISP_ROTATE_0) { - g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH + j*g_uiImgLineoffset; - } else if (g_uiRotateDir == DISP_ROTATE_90) { - g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX - (i-1)*g_uiBarH*g_uiImgLineoffset - j*g_uiImgLineoffset; - } else if (g_uiRotateDir == DISP_ROTATE_270) { - g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH*g_uiImgLineoffset + j*g_uiImgLineoffset; - } + //printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu j:%lu g_uiTotalBarNum:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp, g_uiTotalBarNum); + for (i=1; i <= g_uiBarWtmp; i++) { + if (g_uiRotateDir == DISP_ROTATE_0) { + g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset; + } else if (g_uiRotateDir == DISP_ROTATE_90) { + g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset; + } else if (g_uiRotateDir == DISP_ROTATE_270) { + g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset; + } - switch (g_uiPinPongIdx){ - case 0: - memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); - memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); - break; - case 1: - memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); - memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); - break; - } + switch (g_uiPinPongIdx){ + case 0: + memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); + memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); + break; + case 1: + memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); + memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); + break; } } break; case DISP_DRAW_UPDATEFW_PROMPT: - printf("g_uiPinPongIdx:%lu\r\n", g_uiPinPongIdx); + //printf("g_uiPinPongIdx:%lu\r\n", g_uiPinPongIdx); for (i=0 ;i < g_uiStr4_h; i++) { if (g_uiRotateDir == DISP_ROTATE_0) { @@ -1318,7 +1312,7 @@ void nvt_display_config(UINT32 config_id, UINT32 vlaue) g_uiTotalBarNum = vlaue*2; //wrtie partition + read back partition g_uiBarW = g_uiStr6_h/(vlaue*2); g_uiBarH = g_uiStr6_w; - printf("g_uiBarW:%lu\r\n", g_uiBarW); + //printf("g_uiBarW:%lu\r\n", g_uiBarW); break; } }