Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast

This commit is contained in:
xiaojiazhu 2023-11-09 19:49:25 +08:00
commit a7734d0db0

View File

@ -948,32 +948,37 @@ void nvt_display_draw(UINT32 u32Id)
case DISP_DRAW_UPDATING_BAR: case DISP_DRAW_UPDATING_BAR:
// j = g_uiXBarStep*g_uiBarW + g_uiBarW; // j = g_uiXBarStep*g_uiBarW + g_uiBarW;
g_uiBarWtmp = 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));
g_uiXBarStep++;
printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu j:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp);
for (i=1; i <= g_uiXBarStep; i++) { if(g_uiBarWtmp < (g_uiStr6_h - g_uiBarW))
for (j = 0; j < g_uiBarWtmp; j++) { {
if (g_uiRotateDir == DISP_ROTATE_0) { g_uiBarWtmp = g_uiXBarStep*g_uiBarW + g_uiBarW;
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH /*offset for next bar*/ + j*g_uiImgLineoffset; g_uiXBarStep++;
} 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){ for (i=1; i <= g_uiXBarStep; i++) {
case 0: for (j = 0; j < g_uiBarWtmp; j++) {
memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); if (g_uiRotateDir == DISP_ROTATE_0) {
memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH /*offset for next bar*/ + j*g_uiImgLineoffset;
break; } else if (g_uiRotateDir == DISP_ROTATE_90) {
case 1: g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX - (i-1)*g_uiBarH*g_uiImgLineoffset - j*g_uiImgLineoffset;
memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); } else if (g_uiRotateDir == DISP_ROTATE_270) {
memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH*g_uiImgLineoffset + j*g_uiImgLineoffset;
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; break;
case DISP_DRAW_UPDATEFW_OK: case DISP_DRAW_UPDATEFW_OK: