mirror of
https://github.com/LuckfoxTECH/luckfox-pico.git
synced 2026-01-18 03:28:19 +01:00
fix(luckfox-config):Resolving conflicts between RGB and other pin multiplexing
feat(luckfox-config):Support for touch screens and FBTFT feat(luckfox-config):Support for Ubuntu system feat(ubuntu):Support using local root filesystem for submodule updates feat(ubuntu):Support for WiFi on Luckfox Pico Ultra W using the Ubuntu system perf(ubuntu):Improve the initial boot speed of RV1103 using the Ubuntu system perf(kernel_dts):Improve EMMC read/write speed Signed-off-by: luckfox-eng29 <eng29@luckfox.com>
This commit is contained in:
committed by
luckfox-eng33
parent
6cf97cc3f9
commit
955ff6aa57
@@ -88,6 +88,8 @@
|
||||
# define DPRINTK(fmt, args...)
|
||||
#endif
|
||||
|
||||
#define CURSOR_ENABLE 0
|
||||
#define SHOW_CENTER 1
|
||||
/*
|
||||
* FIXME: Locking
|
||||
*
|
||||
@@ -365,6 +367,7 @@ static int get_color(struct vc_data *vc, struct fb_info *info,
|
||||
|
||||
static void fb_flashcursor(struct work_struct *work)
|
||||
{
|
||||
#if CURSOR_ENABLE
|
||||
struct fb_info *info = container_of(work, struct fb_info, queue);
|
||||
struct fbcon_ops *ops = info->fbcon_par;
|
||||
struct vc_data *vc = NULL;
|
||||
@@ -395,6 +398,7 @@ static void fb_flashcursor(struct work_struct *work)
|
||||
ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
|
||||
get_color(vc, info, c, 0));
|
||||
console_unlock();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void cursor_timer_handler(struct timer_list *t)
|
||||
@@ -599,6 +603,9 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
|
||||
if (fb_get_color_depth(&info->var, &info->fix) == 1)
|
||||
erase &= ~0x400;
|
||||
logo_height = fb_prepare_logo(info, ops->rotate);
|
||||
#if SHOW_CENTER
|
||||
logo_height += (info->var.yres/2) - (logo_height/2);
|
||||
#endif
|
||||
logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height);
|
||||
q = (unsigned short *) (vc->vc_origin +
|
||||
vc->vc_size_row * rows);
|
||||
@@ -1329,6 +1336,7 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only)
|
||||
|
||||
static void fbcon_cursor(struct vc_data *vc, int mode)
|
||||
{
|
||||
#if CURSOR_ENABLE
|
||||
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
|
||||
struct fbcon_ops *ops = info->fbcon_par;
|
||||
int c = scr_readw((u16 *) vc->vc_pos);
|
||||
@@ -1350,6 +1358,7 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
|
||||
|
||||
ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
|
||||
get_color(vc, info, c, 0));
|
||||
#endif
|
||||
}
|
||||
|
||||
static int scrollback_phys_max = 0;
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
#include <asm/fb.h>
|
||||
|
||||
|
||||
#define SHOW_CENTER 1
|
||||
/*
|
||||
* Frame buffer device initialization and setup routines
|
||||
*/
|
||||
@@ -520,6 +520,11 @@ static int fb_show_logo_line(struct fb_info *info, int rotate,
|
||||
image.dy = y;
|
||||
}
|
||||
|
||||
#if SHOW_CENTER
|
||||
image.dx = (info->var.xres - logo->width) / 2;
|
||||
image.dy = (info->var.yres - logo->height) / 2;
|
||||
#endif
|
||||
|
||||
image.width = logo->width;
|
||||
image.height = logo->height;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user