summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/libpayload/drivers/video/video.c39
-rw-r--r--payloads/libpayload/include/libpayload.h1
2 files changed, 24 insertions, 16 deletions
diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c
index 13606d5eb3..d7fc8de923 100644
--- a/payloads/libpayload/drivers/video/video.c
+++ b/payloads/libpayload/drivers/video/video.c
@@ -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;
-
- for(i = 0; i < ARRAY_SIZE(console_list); i++) {
- if (console_list[i]->init())
- continue;
+ int i;
- console = console_list[i];
+ for (i = 0; i < ARRAY_SIZE(console_list); i++) {
+ if (console_list[i]->init())
+ continue;
- if (console->get_cursor)
- console->get_cursor((unsigned int*)&cursorx, (unsigned int*)&cursory, &cursor_enabled);
+ console = console_list[i];
- if (cursorx) {
- cursorx = 0;
- cursory++;
- }
+ if (console->get_cursor)
+ console->get_cursor((unsigned int*)&cursorx,
+ (unsigned int*)&cursory,
+ &cursor_enabled);
- 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;
}
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 3a91cbc959..c7e17d8547 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -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);