1c8e91f21a
Seems that the 'if (cursor_enabled)' check in
video_console_fixup_cursor() that was removed in chromium.org 1f880bca0 really
meant to check for 'if (console)'. Looks like the whole video console
driver is built extra robust to not fail no matter how screwed up the
console is, so let's add this missing check here as well. Also fixed up
a few other missing 'if (!console)' checks while I'm at it.
However, what payloads should really be doing is check the return value
of video_(console_)init() and not call the other video functions if that
failed. This also adapts video_console_init() to correctly pass through
the return value for that purpose (something that seems to have been
overlooked in the dd9e4e58
refactoring).
BUG=chrome-os-partner:28494
TEST=None. I don't know what Dave did to trigger this in the first
place, but it's pretty straight-forward.
Original-Change-Id: I1b9f09d49dc70dacf20621b19e081c754d4814f7
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/200688
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
(cherry picked from commit 3f01d1dc0974774f0b3ba5fc4e069978f266f2fc)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I98c1d8360539b457e6df07cbcf799acaf6c4631b
Reviewed-on: http://review.coreboot.org/7910
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Tested-by: build bot (Jenkins)
224 lines
4.7 KiB
C
224 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 (!console)
|
|
return;
|
|
|
|
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->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)
|
|
{
|
|
if (!console)
|
|
return;
|
|
|
|
/* 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)
|
|
console->putc(cursory, cursorx++, (ch & 0xFF00) | ' ');
|
|
break;
|
|
default:
|
|
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 && 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)
|
|
{
|
|
int ret = video_init();
|
|
if (ret)
|
|
return ret;
|
|
console_add_output_driver(&cons);
|
|
return 0;
|
|
}
|
|
|