2008-04-11 00:49:02 +02:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2008-11-24 18:54:46 +01:00
|
|
|
#include <libpayload-config.h>
|
2008-04-11 00:49:02 +02:00
|
|
|
#include <libpayload.h>
|
|
|
|
#include <video_console.h>
|
|
|
|
|
2013-08-09 13:27:35 +02:00
|
|
|
#ifdef CONFIG_LP_GEODELX_VIDEO_CONSOLE
|
2008-10-08 16:47:41 +02:00
|
|
|
extern struct video_console geodelx_video_console;
|
2008-04-11 17:48:21 +02:00
|
|
|
#endif
|
|
|
|
|
2013-08-09 13:27:35 +02:00
|
|
|
#ifdef CONFIG_LP_COREBOOT_VIDEO_CONSOLE
|
2010-03-25 19:56:26 +01:00
|
|
|
extern struct video_console coreboot_video_console;
|
|
|
|
#endif
|
|
|
|
|
2013-08-09 13:27:35 +02:00
|
|
|
#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
|
2008-04-11 00:49:02 +02:00
|
|
|
extern struct video_console vga_video_console;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static struct video_console *console_list[] =
|
|
|
|
{
|
2013-08-09 13:27:35 +02:00
|
|
|
#ifdef CONFIG_LP_GEODELX_VIDEO_CONSOLE
|
2008-10-08 16:47:41 +02:00
|
|
|
&geodelx_video_console,
|
2008-04-11 17:48:21 +02:00
|
|
|
#endif
|
2013-08-09 13:27:35 +02:00
|
|
|
#ifdef CONFIG_LP_COREBOOT_VIDEO_CONSOLE
|
2010-03-25 19:56:26 +01:00
|
|
|
&coreboot_video_console,
|
|
|
|
#endif
|
2013-08-09 13:27:35 +02:00
|
|
|
#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
|
2008-04-11 00:49:02 +02:00
|
|
|
&vga_video_console,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct video_console *console;
|
|
|
|
|
2008-09-11 19:44:45 +02:00
|
|
|
static int cursorx;
|
|
|
|
static int cursory;
|
2008-04-11 00:49:02 +02:00
|
|
|
static unsigned int cursor_enabled = 1;
|
|
|
|
|
2012-10-06 08:43:37 +02:00
|
|
|
void video_get_rows_cols(unsigned int *rows, unsigned int *cols)
|
|
|
|
{
|
|
|
|
if (console) {
|
|
|
|
*cols = console->columns;
|
|
|
|
*rows = console->rows;
|
|
|
|
} else {
|
|
|
|
*cols = *rows = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-11 00:49:02 +02:00
|
|
|
static void video_console_fixup_cursor(void)
|
|
|
|
{
|
|
|
|
if (!cursor_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (cursorx < 0)
|
|
|
|
cursorx = 0;
|
|
|
|
|
|
|
|
if (cursory < 0)
|
|
|
|
cursory = 0;
|
|
|
|
|
2010-03-25 19:56:26 +01:00
|
|
|
if (cursorx >= console->columns) {
|
2008-04-11 00:49:02 +02:00
|
|
|
cursorx = 0;
|
|
|
|
cursory++;
|
|
|
|
}
|
|
|
|
|
2010-03-25 19:56:26 +01:00
|
|
|
while(cursory >= console->rows) {
|
2008-04-11 00:49:02 +02:00
|
|
|
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);
|
|
|
|
|
|
|
|
cursor_enabled = state;
|
|
|
|
|
|
|
|
if (cursor_enabled)
|
|
|
|
video_console_fixup_cursor();
|
|
|
|
}
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
2008-10-21 17:08:18 +02:00
|
|
|
/* replace black-on-black with light-gray-on-black.
|
2010-03-25 19:56:26 +01:00
|
|
|
* do it here, instead of in libc/console.c
|
|
|
|
*/
|
2008-10-21 17:08:18 +02:00
|
|
|
if ((ch & 0xFF00) == 0) {
|
|
|
|
ch |= 0x0700;
|
|
|
|
}
|
2010-03-25 19:56:26 +01:00
|
|
|
|
2008-04-11 00:49:02 +02:00
|
|
|
switch(ch & 0xFF) {
|
|
|
|
case '\r':
|
|
|
|
cursorx = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\n':
|
libpayload: console: Allow output drivers to print whole strings at once
The console output driver framework in libpayload is currently built on
the putchar primitive, meaning that every driver's function gets called
one character at a time. This becomes an issue when we add drivers that
could output multiple characters at a time, but have a high constant
overhead per invocation (such as the planned GDB stub, which needs to
wrap a special frame around output strings and wait for an
acknowledgement from the server).
This patch adds a new 'write' function pointer to the
console_output_driver structure as an alternative to 'putchar'. Output
drivers need to provide at least one of the two ('write' is preferred if
available). The CBMEM console driver is ported as a proof of concept
(since it's our most performace-critical driver and should in theory
benefit the most from less function pointer invocations, although it's
probably still negligible compared to the big sprawling mess that is
printf()).
Even with this fix, the problem remains that printf() was written with
the putchar primitive in mind. Even though normal text already contains
an optimization to allow multiple characters at a time, almost all
formatting directives cause their output (including things like
padding whitespace) to be putchar()ed one character at a time.
Therefore, this patch reworks parts of the output code (especially
number printing) to all but remove that inefficiency (directives still
invoke an extra write() call, but at least not one per character). Since
I'm touching printf() core code anyway, I also tried to salvage what I
could from that weird, broken "return negative on error" code path (not
that any of our current output drivers can trigger it anyway).
A final consequence of this patch is that the responsibility to prepend
line feeds with carriage returns is moved into the output driver
implementations. Doing this only makes sense for drivers with explicit
cursor position control (i.e. serial or video), and things like the
CBMEM console that appears like a normal file to the system really have
no business containing carriage returns (we don't want people to
accidentally associate us with Windows, now, do we?).
BUG=chrome-os-partner:18390
TEST=Made sure video and CBMEM console still look good, tried printf()
with as many weird edge-case strings as I could find and compared serial
output as well as sprintf() return value.
Original-Change-Id: Ie05ae489332a0103461620f5348774b6d4afd91a
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/196384
Original-Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
(cherry picked from commit ab1ef0c07736fe1aa3e0baaf02d258731e6856c0)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I78f5aedf6d0c3665924995cdab691ee0162de404
Reviewed-on: http://review.coreboot.org/7880
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
2014-04-18 05:00:20 +02:00
|
|
|
cursorx = 0;
|
2008-04-11 00:49:02 +02:00
|
|
|
cursory++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\b':
|
|
|
|
cursorx--;
|
2008-09-11 19:44:45 +02:00
|
|
|
if (cursorx < 0) {
|
|
|
|
cursory--;
|
2010-03-25 19:56:26 +01:00
|
|
|
cursorx = console->columns;
|
2008-09-11 19:44:45 +02:00
|
|
|
}
|
2008-04-11 00:49:02 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '\t':
|
2010-03-25 19:56:26 +01:00
|
|
|
while(cursorx % 8 && cursorx < console->columns) {
|
2008-04-11 00:49:02 +02:00
|
|
|
if (console)
|
2008-05-14 22:07:31 +02:00
|
|
|
console->putc(cursory, cursorx, (ch & 0xFF00) | ' ');
|
2008-04-11 00:49:02 +02:00
|
|
|
|
|
|
|
cursorx++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (console)
|
2008-05-14 22:07:31 +02:00
|
|
|
console->putc(cursory, cursorx++, ch);
|
2008-04-11 00:49:02 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
video_console_fixup_cursor();
|
|
|
|
}
|
|
|
|
|
2008-08-19 19:44:49 +02:00
|
|
|
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();
|
|
|
|
}
|
|
|
|
|
2008-10-21 17:08:18 +02:00
|
|
|
static struct console_output_driver cons = {
|
|
|
|
.putchar = video_console_putchar
|
|
|
|
};
|
|
|
|
|
2012-10-06 08:35:04 +02:00
|
|
|
int video_init(void)
|
2008-04-11 00:49:02 +02:00
|
|
|
{
|
2012-10-06 08:35:04 +02:00
|
|
|
int i;
|
2008-04-11 00:49:02 +02:00
|
|
|
|
2012-10-06 08:35:04 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(console_list); i++) {
|
|
|
|
if (console_list[i]->init())
|
|
|
|
continue;
|
2008-04-11 00:49:02 +02:00
|
|
|
|
2012-10-06 08:35:04 +02:00
|
|
|
console = console_list[i];
|
2008-04-11 00:49:02 +02:00
|
|
|
|
2012-10-06 08:35:04 +02:00
|
|
|
if (console->get_cursor)
|
|
|
|
console->get_cursor((unsigned int*)&cursorx,
|
|
|
|
(unsigned int*)&cursory,
|
|
|
|
&cursor_enabled);
|
2008-04-11 00:49:02 +02:00
|
|
|
|
2012-10-06 08:35:04 +02:00
|
|
|
if (cursorx) {
|
|
|
|
cursorx = 0;
|
|
|
|
cursory++;
|
2008-04-11 00:49:02 +02:00
|
|
|
}
|
|
|
|
|
2012-10-06 08:35:04 +02:00
|
|
|
video_console_fixup_cursor();
|
2008-04-11 00:49:02 +02:00
|
|
|
return 0;
|
2012-10-06 08:35:04 +02:00
|
|
|
}
|
2013-01-16 00:48:55 +01:00
|
|
|
return 1;
|
2012-10-06 08:35:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int video_console_init(void)
|
|
|
|
{
|
|
|
|
video_init();
|
|
|
|
if (console)
|
|
|
|
console_add_output_driver(&cons);
|
|
|
|
return 0;
|
2008-04-11 00:49:02 +02:00
|
|
|
}
|
|
|
|
|