libpayload: Separate video initialization and the video console.
It's possible to want to display text on the display without using it as a console. This change separates the initialization of the video code from setting up the video console by pulling out everything but installing the console into a new function called video_init. Change-Id: Ie07654ca13f79489c0e9b3a4998b96f598ab8513 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://review.coreboot.org/1733 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
parent
a54b6a6143
commit
dd9e4e58cd
|
@ -183,29 +183,36 @@ static struct console_output_driver cons = {
|
|||
.putchar = video_console_putchar
|
||||
};
|
||||
|
||||
int video_console_init(void)
|
||||
int video_init(void)
|
||||
{
|
||||
int i;
|
||||
int i;
|
||||
|
||||
for(i = 0; i < ARRAY_SIZE(console_list); i++) {
|
||||
if (console_list[i]->init())
|
||||
continue;
|
||||
for (i = 0; i < ARRAY_SIZE(console_list); i++) {
|
||||
if (console_list[i]->init())
|
||||
continue;
|
||||
|
||||
console = console_list[i];
|
||||
console = console_list[i];
|
||||
|
||||
if (console->get_cursor)
|
||||
console->get_cursor((unsigned int*)&cursorx, (unsigned int*)&cursory, &cursor_enabled);
|
||||
if (console->get_cursor)
|
||||
console->get_cursor((unsigned int*)&cursorx,
|
||||
(unsigned int*)&cursory,
|
||||
&cursor_enabled);
|
||||
|
||||
if (cursorx) {
|
||||
cursorx = 0;
|
||||
cursory++;
|
||||
}
|
||||
|
||||
video_console_fixup_cursor();
|
||||
console_add_output_driver(&cons);
|
||||
return 0;
|
||||
if (cursorx) {
|
||||
cursorx = 0;
|
||||
cursory++;
|
||||
}
|
||||
|
||||
video_console_fixup_cursor();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
int video_console_init(void)
|
||||
{
|
||||
video_init();
|
||||
if (console)
|
||||
console_add_output_driver(&cons);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -192,6 +192,7 @@ void speaker_tone(u16 freq, unsigned int duration);
|
|||
* @ingroup input
|
||||
* @{
|
||||
*/
|
||||
int video_init(void);
|
||||
int video_console_init(void);
|
||||
void video_console_putchar(unsigned int ch);
|
||||
void video_console_putc(u8 row, u8 col, unsigned int ch);
|
||||
|
|
Loading…
Reference in New Issue