From 26a955507379f6933e4287fbbbae7b618657cf48 Mon Sep 17 00:00:00 2001 From: Hsuan Ting Chen Date: Mon, 20 Feb 2023 11:49:35 +0800 Subject: [PATCH] vga: Change the arguments of vga_write_text to support extended ASCII VGA defined the extended ASCII set based on CP437, but the function vga_write_text() accepts a signed char array. This will cause unnecessary confusion that if we want to print u with umlaut (code=129 in CP437), we need to explicitly cast it to -127 in signed char. Since we still want to leverage the built-in string utilities which only accepts const char*, we still need to cast it to signed char while processing, and cast it back to unsigned once we write into the frame buffer. BRANCH=brya BUG=b:264666392 TEST=emerge-brya coreboot chromeos-bootimage Signed-off-by: Hsuan Ting Chen Change-Id: If555bbc05f40ce3f02339c0468afff6dda8b7ded Reviewed-on: https://review.coreboot.org/c/coreboot/+/73099 Tested-by: build bot (Jenkins) Reviewed-by: Tarun Tuli --- src/drivers/pc80/vga/vga.c | 4 +++- src/include/pc80/vga.h | 3 ++- src/soc/intel/alderlake/romstage/ux.c | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/drivers/pc80/vga/vga.c b/src/drivers/pc80/vga/vga.c index a9befcaccc..7f8ce69795 100644 --- a/src/drivers/pc80/vga/vga.c +++ b/src/drivers/pc80/vga/vga.c @@ -283,8 +283,10 @@ vga_line_write(unsigned int line, const char *string) } void -vga_write_text(enum VGA_TEXT_ALIGNMENT alignment, unsigned int line, const char *string) +vga_write_text(enum VGA_TEXT_ALIGNMENT alignment, unsigned int line, + const unsigned char *ustring) { + const char *string = (const char *)ustring; char str[VGA_COLUMNS * VGA_LINES] = {0}; memcpy(str, string, strnlen(string, sizeof(str) - 1)); diff --git a/src/include/pc80/vga.h b/src/include/pc80/vga.h index ec012f5bdf..7a97afe5e5 100644 --- a/src/include/pc80/vga.h +++ b/src/include/pc80/vga.h @@ -33,6 +33,7 @@ void vga_line_write(unsigned int line, const char *string); * vga_write_text() writes a line of text aligned left/center/right * horizontally on the screen (i.e. enum VGA_TEXT_ALIGNMENT) */ -void vga_write_text(enum VGA_TEXT_ALIGNMENT alignment, unsigned int line, const char *string); +void vga_write_text(enum VGA_TEXT_ALIGNMENT alignment, unsigned int line, + const unsigned char *ustring); #endif /* VGA_H */ diff --git a/src/soc/intel/alderlake/romstage/ux.c b/src/soc/intel/alderlake/romstage/ux.c index 5dba194a6b..23fd0fef7e 100644 --- a/src/soc/intel/alderlake/romstage/ux.c +++ b/src/soc/intel/alderlake/romstage/ux.c @@ -14,6 +14,9 @@ bool ux_inform_user_of_update_operation(const char *name) printk(BIOS_INFO, "Informing user on-display of %s.\n", name); vga_write_text(VGA_TEXT_CENTER, VGA_TEXT_HORIZONTAL_MIDDLE, - "Your device is finishing an update. This may take 1-2 minutes.\nPlease do not turn off your device."); + (const unsigned char *) + "Your device is finishing an update. " + "This may take 1-2 minutes.\n" + "Please do not turn off your device."); return true; }