bdk: display: rename functions

display_init_framebuffer_pitch -> display_init_window_a_pitch
display_init_framebuffer_pitch_vic -> display_init_window_a_pitch_vic
display_init_framebuffer_pitch_inv -> display_init_window_a_pitch_inv
display_init_framebuffer_block -> display_init_window_a_block
display_init_framebuffer_log -> display_init_window_d_console
display_activate_console -> display_window_d_console_enable
display_deactivate_console -> display_window_d_console_disable
display_init_cursor -> display_cursor_init
display_set_pos_cursor -> display_cursor_set_pos
display_deinit_cursor -> display_cursor_deinit
This commit is contained in:
CTCaer 2024-06-05 01:00:58 +03:00
parent 4fef1890aa
commit 48ef1826e9
2 changed files with 22 additions and 21 deletions

View file

@ -861,7 +861,7 @@ void display_color_screen(u32 color)
display_backlight_brightness(150, 0); display_backlight_brightness(150, 0);
} }
u32 *display_init_framebuffer_pitch() u32 *display_init_window_a_pitch()
{ {
// Sanitize framebuffer area. // Sanitize framebuffer area.
memset((u32 *)IPL_FB_ADDRESS, 0, IPL_FB_SZ); memset((u32 *)IPL_FB_ADDRESS, 0, IPL_FB_SZ);
@ -873,7 +873,7 @@ u32 *display_init_framebuffer_pitch()
return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR)); return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR));
} }
u32 *display_init_framebuffer_pitch_vic() u32 *display_init_window_a_pitch_vic()
{ {
// This configures the framebuffer @ NYX_FB_ADDRESS with a resolution of 720x1280 (line stride 720). // This configures the framebuffer @ NYX_FB_ADDRESS with a resolution of 720x1280 (line stride 720).
if (_display_id != PANEL_SAM_AMS699VC01) if (_display_id != PANEL_SAM_AMS699VC01)
@ -885,7 +885,7 @@ u32 *display_init_framebuffer_pitch_vic()
return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR)); return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR));
} }
u32 *display_init_framebuffer_pitch_inv() u32 *display_init_window_a_pitch_inv()
{ {
// This configures the framebuffer @ NYX_FB_ADDRESS with a resolution of 720x1280 (line stride 720). // This configures the framebuffer @ NYX_FB_ADDRESS with a resolution of 720x1280 (line stride 720).
reg_write_array((u32 *)DISPLAY_A_BASE, _di_winA_pitch_inv, ARRAY_SIZE(_di_winA_pitch_inv)); reg_write_array((u32 *)DISPLAY_A_BASE, _di_winA_pitch_inv, ARRAY_SIZE(_di_winA_pitch_inv));
@ -894,7 +894,7 @@ u32 *display_init_framebuffer_pitch_inv()
return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR)); return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR));
} }
u32 *display_init_framebuffer_block() u32 *display_init_window_a_block()
{ {
// This configures the framebuffer @ NYX_FB_ADDRESS with a resolution of 720x1280. // This configures the framebuffer @ NYX_FB_ADDRESS with a resolution of 720x1280.
reg_write_array((u32 *)DISPLAY_A_BASE, _di_winA_block, ARRAY_SIZE(_di_winA_block)); reg_write_array((u32 *)DISPLAY_A_BASE, _di_winA_block, ARRAY_SIZE(_di_winA_block));
@ -903,7 +903,7 @@ u32 *display_init_framebuffer_block()
return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR)); return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR));
} }
u32 *display_init_framebuffer_log() u32 *display_init_window_d_console()
{ {
// This configures the framebuffer @ LOG_FB_ADDRESS with a resolution of 1280x720 (line stride 720). // This configures the framebuffer @ LOG_FB_ADDRESS with a resolution of 1280x720 (line stride 720).
reg_write_array((u32 *)DISPLAY_A_BASE, _di_winD_log, ARRAY_SIZE(_di_winD_log)); reg_write_array((u32 *)DISPLAY_A_BASE, _di_winD_log, ARRAY_SIZE(_di_winD_log));
@ -911,7 +911,7 @@ u32 *display_init_framebuffer_log()
return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR)); return (u32 *)DISPLAY_A(_DIREG(DC_WINBUF_START_ADDR));
} }
void display_activate_console() void display_window_d_console_enable()
{ {
// Only update active registers on vsync. // Only update active registers on vsync.
DISPLAY_A(_DIREG(DC_CMD_REG_ACT_CONTROL)) = DISPLAY_A(_DIREG(DC_CMD_REG_ACT_CONTROL)) & ~WIN_D_ACT_HCNTR_SEL; DISPLAY_A(_DIREG(DC_CMD_REG_ACT_CONTROL)) = DISPLAY_A(_DIREG(DC_CMD_REG_ACT_CONTROL)) & ~WIN_D_ACT_HCNTR_SEL;
@ -949,7 +949,7 @@ void display_activate_console()
DISPLAY_A(_DIREG(DC_CMD_DISPLAY_WINDOW_HEADER)) = WINDOW_A_SELECT; DISPLAY_A(_DIREG(DC_CMD_DISPLAY_WINDOW_HEADER)) = WINDOW_A_SELECT;
} }
void display_deactivate_console() void display_window_d_console_disable()
{ {
// Select window D. // Select window D.
DISPLAY_A(_DIREG(DC_CMD_DISPLAY_WINDOW_HEADER)) = WINDOW_D_SELECT; DISPLAY_A(_DIREG(DC_CMD_DISPLAY_WINDOW_HEADER)) = WINDOW_D_SELECT;
@ -978,7 +978,7 @@ void display_deactivate_console()
DISPLAY_A(_DIREG(DC_CMD_DISPLAY_WINDOW_HEADER)) = WINDOW_A_SELECT; DISPLAY_A(_DIREG(DC_CMD_DISPLAY_WINDOW_HEADER)) = WINDOW_A_SELECT;
} }
void display_init_cursor(void *crs_fb, u32 size) void display_cursor_init(void *crs_fb, u32 size)
{ {
// Setup cursor. // Setup cursor.
DISPLAY_A(_DIREG(DC_DISP_CURSOR_START_ADDR)) = CURSOR_CLIPPING(CURSOR_CLIP_WIN_A) | size | ((u32)crs_fb >> 10); DISPLAY_A(_DIREG(DC_DISP_CURSOR_START_ADDR)) = CURSOR_CLIPPING(CURSOR_CLIP_WIN_A) | size | ((u32)crs_fb >> 10);
@ -994,7 +994,7 @@ void display_init_cursor(void *crs_fb, u32 size)
DISPLAY_A(_DIREG(DC_CMD_STATE_CONTROL)) = GENERAL_ACT_REQ | CURSOR_ACT_REQ; DISPLAY_A(_DIREG(DC_CMD_STATE_CONTROL)) = GENERAL_ACT_REQ | CURSOR_ACT_REQ;
} }
void display_set_pos_cursor(u32 x, u32 y) void display_cursor_set_pos(u32 x, u32 y)
{ {
// Set cursor position. // Set cursor position.
DISPLAY_A(_DIREG(DC_DISP_CURSOR_POSITION)) = x | (y << 16); DISPLAY_A(_DIREG(DC_DISP_CURSOR_POSITION)) = x | (y << 16);
@ -1004,7 +1004,7 @@ void display_set_pos_cursor(u32 x, u32 y)
DISPLAY_A(_DIREG(DC_CMD_STATE_CONTROL)) = GENERAL_ACT_REQ | CURSOR_ACT_REQ; DISPLAY_A(_DIREG(DC_CMD_STATE_CONTROL)) = GENERAL_ACT_REQ | CURSOR_ACT_REQ;
} }
void display_deinit_cursor() void display_cursor_deinit()
{ {
DISPLAY_A(_DIREG(DC_DISP_BLEND_CURSOR_CONTROL)) = 0; DISPLAY_A(_DIREG(DC_DISP_BLEND_CURSOR_CONTROL)) = 0;
DISPLAY_A(_DIREG(DC_DISP_DISP_WIN_OPTIONS)) &= ~CURSOR_ENABLE; DISPLAY_A(_DIREG(DC_DISP_DISP_WIN_OPTIONS)) &= ~CURSOR_ENABLE;

View file

@ -868,17 +868,18 @@ void display_backlight(bool enable);
void display_backlight_brightness(u32 brightness, u32 step_delay); void display_backlight_brightness(u32 brightness, u32 step_delay);
u32 display_get_backlight_brightness(); u32 display_get_backlight_brightness();
/*! Init display in full 720x1280 resolution (B8G8R8A8, line stride 720, framebuffer size = 720*1280*4 bytes). */ u32 *display_init_window_a_pitch();
u32 *display_init_framebuffer_pitch(); u32 *display_init_window_a_pitch_vic();
u32 *display_init_framebuffer_pitch_vic(); u32 *display_init_window_a_pitch_inv();
u32 *display_init_framebuffer_pitch_inv(); u32 *display_init_window_a_block();
u32 *display_init_framebuffer_block(); u32 *display_init_window_d_console();
u32 *display_init_framebuffer_log();
void display_activate_console(); void display_window_d_console_enable();
void display_deactivate_console(); void display_window_d_console_disable();
void display_init_cursor(void *crs_fb, u32 size);
void display_set_pos_cursor(u32 x, u32 y); void display_cursor_init(void *crs_fb, u32 size);
void display_deinit_cursor(); void display_cursor_set_pos(u32 x, u32 y);
void display_cursor_deinit();
int display_dsi_read(u8 cmd, u32 len, void *data); int display_dsi_read(u8 cmd, u32 len, void *data);
int display_dsi_vblank_read(u8 cmd, u32 len, void *data); int display_dsi_vblank_read(u8 cmd, u32 len, void *data);