b4fbee9a41
The video console runs a video_console_fixup_cursor() function after every printed character to make sure the cursor is still in the output window and avoid overflows. For some crazy reason, this function does not run when cursor_enabled is false... however, that variable is only about cursor *visibility*, and it's imperative that we still do proper bounds checking for our output even if the cursor itself doesn't get displayed (otherwise we can end up overwriting malloc cookies that cause a panic on the next free() and other fun things like that). In fact, there seems to be no reason at all to even keep track of the cursor visibility state in the generic video console framework (the specific backends already do it, too), so let's remove that code entirely. Also set the default cursor visibilty in the corebootfb backend to 0 since that's consistent with what the other backends do. BUG=None TEST=Turn on video console on Big, generate enough output to make it scroll, make sure it does not crash. Original-Change-Id: I1201a5bccb4711b6ecfc4cf47a8ace16331501b4 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/196323 Original-Reviewed-by: Gabe Black <gabeblack@chromium.org> Original-Reviewed-by: Hung-Te Lin <hungte@chromium.org> Original-Reviewed-by: Stefan Reinauer <reinauer@chromium.org> (cherry picked from commit 1f880bca06ed0a3f2c75abab399d32a2e51ed10e) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I6c67a9efb00d96fcd67f7bc1ab55a23e78fc479e Reviewed-on: http://review.coreboot.org/7908 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
222 lines
4.7 KiB
C
222 lines
4.7 KiB
C
/*
|
|
* This file is part of the libpayload project.
|
|
*
|
|
* Copyright (C) 2008 Advanced Micro Devices, Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <libpayload-config.h>
|
|
#include <libpayload.h>
|
|
#include <video_console.h>
|
|
|
|
#ifdef CONFIG_LP_GEODELX_VIDEO_CONSOLE
|
|
extern struct video_console geodelx_video_console;
|
|
#endif
|
|
|
|
#ifdef CONFIG_LP_COREBOOT_VIDEO_CONSOLE
|
|
extern struct video_console coreboot_video_console;
|
|
#endif
|
|
|
|
#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
|
|
extern struct video_console vga_video_console;
|
|
#endif
|
|
|
|
static struct video_console *console_list[] =
|
|
{
|
|
#ifdef CONFIG_LP_GEODELX_VIDEO_CONSOLE
|
|
&geodelx_video_console,
|
|
#endif
|
|
#ifdef CONFIG_LP_COREBOOT_VIDEO_CONSOLE
|
|
&coreboot_video_console,
|
|
#endif
|
|
#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
|
|
&vga_video_console,
|
|
#endif
|
|
};
|
|
|
|
static struct video_console *console;
|
|
|
|
static int cursorx;
|
|
static int cursory;
|
|
|
|
void video_get_rows_cols(unsigned int *rows, unsigned int *cols)
|
|
{
|
|
if (console) {
|
|
*cols = console->columns;
|
|
*rows = console->rows;
|
|
} else {
|
|
*cols = *rows = 0;
|
|
}
|
|
}
|
|
|
|
static void video_console_fixup_cursor(void)
|
|
{
|
|
if (cursorx < 0)
|
|
cursorx = 0;
|
|
|
|
if (cursory < 0)
|
|
cursory = 0;
|
|
|
|
if (cursorx >= console->columns) {
|
|
cursorx = 0;
|
|
cursory++;
|
|
}
|
|
|
|
while(cursory >= console->rows) {
|
|
console->scroll_up();
|
|
cursory--;
|
|
}
|
|
|
|
if (console && console->set_cursor)
|
|
console->set_cursor(cursorx, cursory);
|
|
}
|
|
|
|
void video_console_cursor_enable(int state)
|
|
{
|
|
if (console && console->enable_cursor)
|
|
console->enable_cursor(state);
|
|
}
|
|
|
|
void video_console_clear(void)
|
|
{
|
|
if (console)
|
|
console->clear();
|
|
|
|
cursorx = 0;
|
|
cursory = 0;
|
|
|
|
if (console && console->set_cursor)
|
|
console->set_cursor(cursorx, cursory);
|
|
}
|
|
|
|
void video_console_putc(u8 row, u8 col, unsigned int ch)
|
|
{
|
|
if (console)
|
|
console->putc(row, col, ch);
|
|
}
|
|
|
|
void video_console_putchar(unsigned int ch)
|
|
{
|
|
/* replace black-on-black with light-gray-on-black.
|
|
* do it here, instead of in libc/console.c
|
|
*/
|
|
if ((ch & 0xFF00) == 0) {
|
|
ch |= 0x0700;
|
|
}
|
|
|
|
switch(ch & 0xFF) {
|
|
case '\r':
|
|
cursorx = 0;
|
|
break;
|
|
|
|
case '\n':
|
|
cursorx = 0;
|
|
cursory++;
|
|
break;
|
|
|
|
case '\b':
|
|
cursorx--;
|
|
if (cursorx < 0) {
|
|
cursory--;
|
|
cursorx = console->columns;
|
|
}
|
|
break;
|
|
|
|
case '\t':
|
|
while(cursorx % 8 && cursorx < console->columns) {
|
|
if (console)
|
|
console->putc(cursory, cursorx, (ch & 0xFF00) | ' ');
|
|
|
|
cursorx++;
|
|
}
|
|
break;
|
|
default:
|
|
if (console)
|
|
console->putc(cursory, cursorx++, ch);
|
|
break;
|
|
}
|
|
|
|
video_console_fixup_cursor();
|
|
}
|
|
|
|
void video_console_get_cursor(unsigned int *x, unsigned int *y, unsigned int *en)
|
|
{
|
|
*x=0;
|
|
*y=0;
|
|
*en=0;
|
|
|
|
if (console->get_cursor)
|
|
console->get_cursor(x, y, en);
|
|
|
|
*x = cursorx;
|
|
*y = cursory;
|
|
}
|
|
|
|
void video_console_set_cursor(unsigned int x, unsigned int y)
|
|
{
|
|
cursorx = x;
|
|
cursory = y;
|
|
video_console_fixup_cursor();
|
|
}
|
|
|
|
static struct console_output_driver cons = {
|
|
.putchar = video_console_putchar
|
|
};
|
|
|
|
int video_init(void)
|
|
{
|
|
int i;
|
|
unsigned int dummy_cursor_enabled;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(console_list); i++) {
|
|
if (console_list[i]->init())
|
|
continue;
|
|
|
|
console = console_list[i];
|
|
|
|
if (console->get_cursor)
|
|
console->get_cursor((unsigned int*)&cursorx,
|
|
(unsigned int*)&cursory,
|
|
&dummy_cursor_enabled);
|
|
|
|
if (cursorx) {
|
|
cursorx = 0;
|
|
cursory++;
|
|
}
|
|
|
|
video_console_fixup_cursor();
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
int video_console_init(void)
|
|
{
|
|
video_init();
|
|
if (console)
|
|
console_add_output_driver(&cons);
|
|
return 0;
|
|
}
|
|
|