Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

video console: move vidconsole_get_font_size() logic to driver ops

Browse source 
Since multiple vidconsole drivers exists, vidconsole_get_font_size()
implementation cannot longer live in vidconsole_uclass.c file.

Move current vidconsole_get_font_size logic to truetype driver ops.

Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Dzmitry Sankouski 2023-03-07 13:21:15 +03:00 committed by Anatolij Gustschin
parent 39c1fa2c21
commit 4f6e34811d
5 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/font.c
View file

@ -61,7 +61,11 @@ static int do_font_size(struct cmd_tbl *cmdtp, int flag, int argc,
if (uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev)) if (uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev))
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
font_name = vidconsole_get_font_size(dev, &size); ret = vidconsole_get_font_size(dev, &font_name, &size);
if (ret) {
printf("Failed (error %d)\n", ret);
return CMD_RET_FAILURE;
}
size = dectoul(argv[1], NULL); size = dectoul(argv[1], NULL);

3
drivers/video/console_truetype.c
View file

@ -724,7 +724,7 @@ static int truetype_select_font(struct udevice *dev, const char *name,
return 0; return 0;
} }
const char *vidconsole_get_font_size(struct udevice *dev, uint *sizep) const char *console_truetype_get_font_size(struct udevice *dev, uint *sizep)
{ {
struct console_tt_priv *priv = dev_get_priv(dev); struct console_tt_priv *priv = dev_get_priv(dev);
struct console_tt_metrics *met = priv->cur_met; struct console_tt_metrics *met = priv->cur_met;
@ -773,6 +773,7 @@ struct vidconsole_ops console_truetype_ops = {
.backspace = console_truetype_backspace, .backspace = console_truetype_backspace,
.entry_start = console_truetype_entry_start, .entry_start = console_truetype_entry_start,
.get_font = console_truetype_get_font, .get_font = console_truetype_get_font,
.get_font_size = console_truetype_get_font_size,
.select_font = truetype_select_font, .select_font = truetype_select_font,
}; };

11
drivers/video/vidconsole-uclass.c
View file

@ -575,6 +575,17 @@ int vidconsole_get_font(struct udevice *dev, int seq,
return ops->get_font(dev, seq, info); return ops->get_font(dev, seq, info);
} }
int vidconsole_get_font_size(struct udevice *dev, const char **name, uint *sizep)
{
struct vidconsole_ops *ops = vidconsole_get_ops(dev);
if (!ops->get_font_size)
return -ENOSYS;
*name = ops->get_font_size(dev, sizep);
return 0;
}
int vidconsole_select_font(struct udevice *dev, const char *name, uint size) int vidconsole_select_font(struct udevice *dev, const char *name, uint size)
{ {
struct vidconsole_ops *ops = vidconsole_get_ops(dev); struct vidconsole_ops *ops = vidconsole_get_ops(dev);

14
include/video_console.h
View file

@ -160,6 +160,15 @@ struct vidconsole_ops {
int (*get_font)(struct udevice *dev, int seq, int (*get_font)(struct udevice *dev, int seq,
struct vidfont_info *info); struct vidfont_info *info);
/**
* get_font_size() - get the current font name and size
*
* @dev: vidconsole device
* @sizep: Place to put the font size (nominal height in pixels)
* Returns: Current font name
*/
const char *(*get_font_size)(struct udevice *dev, uint *sizep);
/** /**
* select_font() - Select a particular font by name / size * select_font() - Select a particular font by name / size
* *
@ -303,9 +312,10 @@ void vidconsole_list_fonts(struct udevice *dev);
* *
* @dev: vidconsole device * @dev: vidconsole device
* @sizep: Place to put the font size (nominal height in pixels) * @sizep: Place to put the font size (nominal height in pixels)
* Returns: Current font name * @name: pointer to font name, a placeholder for result
* Return: 0 if OK, -ENOSYS if not implemented in driver
*/ */
const char *vidconsole_get_font_size(struct udevice *dev, uint *sizep); int vidconsole_get_font_size(struct udevice *dev, const char **name, uint *sizep);
#ifdef CONFIG_VIDEO_COPY #ifdef CONFIG_VIDEO_COPY
/** /**

13
test/cmd/font.c
View file

@ -19,6 +19,7 @@
static int font_test_base(struct unit_test_state *uts) static int font_test_base(struct unit_test_state *uts)
{ {
struct udevice *dev; struct udevice *dev;
const char *name;
int max_metrics; int max_metrics;
uint size; uint size;
int ret; int ret;
@ -32,8 +33,8 @@ static int font_test_base(struct unit_test_state *uts)
ut_assert_nextline("cantoraone_regular"); ut_assert_nextline("cantoraone_regular");
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
ut_asserteq_str("nimbus_sans_l_regular", ut_assertok(vidconsole_get_font_size(dev, &name, &size));
vidconsole_get_font_size(dev, &size)); ut_asserteq_str("nimbus_sans_l_regular", name);
ut_asserteq(18, size); ut_asserteq(18, size);
max_metrics = 1; max_metrics = 1;
@ -52,15 +53,15 @@ static int font_test_base(struct unit_test_state *uts)
ut_assertok(ret); ut_assertok(ret);
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
ut_asserteq_str("cantoraone_regular", ut_assertok(vidconsole_get_font_size(dev, &name, &size));
vidconsole_get_font_size(dev, &size)); ut_asserteq_str("cantoraone_regular", name);
ut_asserteq(40, size); ut_asserteq(40, size);
ut_assertok(run_command("font size 30", 0)); ut_assertok(run_command("font size 30", 0));
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
ut_asserteq_str("cantoraone_regular", ut_assertok(vidconsole_get_font_size(dev, &name, &size));
vidconsole_get_font_size(dev, &size)); ut_asserteq_str("cantoraone_regular", name);
ut_asserteq(30, size); ut_asserteq(30, size);
return 0; return 0;