From b4aa5d34cff441f4f4f5f0e5593ecd17f5568ea1 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Thu, 19 May 2011 03:33:56 +0000 Subject: [PATCH] Build fixes. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41578 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../boot/platform/atari_m68k/console.cpp | 20 +++++++++++++---- src/system/boot/platform/atari_m68k/menu.cpp | 10 ++++++++- src/system/boot/platform/bios_ia32/menu.cpp | 2 +- .../boot/platform/openfirmware/console.cpp | 14 +++++++++++- .../boot/platform/openfirmware/menu.cpp | 8 +++++++ src/system/boot/platform/u-boot/console.cpp | 22 ++++++++++++++----- src/system/boot/platform/u-boot/menu.cpp | 9 +++++++- 7 files changed, 72 insertions(+), 13 deletions(-) diff --git a/src/system/boot/platform/atari_m68k/console.cpp b/src/system/boot/platform/atari_m68k/console.cpp index 71676546a3..1180df4f2e 100644 --- a/src/system/boot/platform/atari_m68k/console.cpp +++ b/src/system/boot/platform/atari_m68k/console.cpp @@ -146,7 +146,7 @@ InputConsoleHandle::PutChars(const char *buffer, int count) PutChar(buffer[i]); } - + char InputConsoleHandle::GetChar() { @@ -238,10 +238,10 @@ translate_color(int32 color) f: ff ff ff // white */ // cf. http://www.fortunecity.com/skyscraper/apple/308/html/chap4.htm - static const char cmap[] = { - 15, 4, 2, 6, 1, 5, 3, 7, + static const char cmap[] = { + 15, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 0 }; - + if (color < 0 && color >= 16) return 0; return cmap[color]; @@ -259,6 +259,18 @@ console_set_color(int32 foreground, int32 background) } +void +console_show_cursor(void) +{ +} + + +void +console_hide_cursor(void) +{ +} + + int console_wait_for_key(void) { diff --git a/src/system/boot/platform/atari_m68k/menu.cpp b/src/system/boot/platform/atari_m68k/menu.cpp index 24125b389d..429951dbb6 100644 --- a/src/system/boot/platform/atari_m68k/menu.cpp +++ b/src/system/boot/platform/atari_m68k/menu.cpp @@ -52,7 +52,7 @@ platform_add_menus(Menu *menu) } -void +void platform_update_menu_item(Menu *menu, MenuItem *item) { platform_generic_update_text_menu_item(menu, item); @@ -65,3 +65,11 @@ platform_run_menu(Menu *menu) platform_generic_run_text_menu(menu); } + +size_t +platform_get_user_input_text(Menu* menu, const char* prompt, char *buffer, + size_t bufferSize) +{ + return platform_generic_get_user_input_text(menu, prompt, buffer, + bufferSize); +} diff --git a/src/system/boot/platform/bios_ia32/menu.cpp b/src/system/boot/platform/bios_ia32/menu.cpp index 9fe9e1df59..d26879f1aa 100644 --- a/src/system/boot/platform/bios_ia32/menu.cpp +++ b/src/system/boot/platform/bios_ia32/menu.cpp @@ -114,7 +114,7 @@ platform_run_menu(Menu* menu) size_t -platform_get_user_input_text(Menu* menu, const char* prompt, char *buffer, +platform_get_user_input_text(Menu* menu, const char* prompt, char* buffer, size_t bufferSize) { return platform_generic_get_user_input_text(menu, prompt, buffer, diff --git a/src/system/boot/platform/openfirmware/console.cpp b/src/system/boot/platform/openfirmware/console.cpp index 2ba6422278..f2aef4d32d 100644 --- a/src/system/boot/platform/openfirmware/console.cpp +++ b/src/system/boot/platform/openfirmware/console.cpp @@ -171,7 +171,7 @@ InputConsoleHandle::PutChars(const char *buffer, int count) PutChar(buffer[i]); } - + char InputConsoleHandle::GetChar() { @@ -252,6 +252,18 @@ console_set_cursor(int32 x, int32 y) } +void +console_show_cursor(void) +{ +} + + +void +console_hide_cursor(void) +{ +} + + static int translate_color(int32 color) { diff --git a/src/system/boot/platform/openfirmware/menu.cpp b/src/system/boot/platform/openfirmware/menu.cpp index d14c87e435..03e69d3f81 100644 --- a/src/system/boot/platform/openfirmware/menu.cpp +++ b/src/system/boot/platform/openfirmware/menu.cpp @@ -38,3 +38,11 @@ platform_run_menu(Menu *menu) platform_generic_run_text_menu(menu); } + +size_t +platform_get_user_input_text(Menu *menu, const char *prompt, char *buffer, + size_t bufferSize) +{ + return platform_generic_get_user_input_text(menu, prompt, buffer, + bufferSize); +} diff --git a/src/system/boot/platform/u-boot/console.cpp b/src/system/boot/platform/u-boot/console.cpp index 0564301ed1..9c665a65cf 100644 --- a/src/system/boot/platform/u-boot/console.cpp +++ b/src/system/boot/platform/u-boot/console.cpp @@ -65,7 +65,7 @@ Console::WriteAt(void *cookie, off_t /*pos*/, const void *buffer, size_t bufferS void console_clear_screen(void) { - + } @@ -83,17 +83,29 @@ console_height(void) } -void +void console_set_cursor(int32 x, int32 y) { - + } -void +void +console_show_cursor(void) +{ +} + + +void +console_hide_cursor(void) +{ +} + + +void console_set_color(int32 foreground, int32 background) { - + } diff --git a/src/system/boot/platform/u-boot/menu.cpp b/src/system/boot/platform/u-boot/menu.cpp index 5c0ebad3f4..7510b66f81 100644 --- a/src/system/boot/platform/u-boot/menu.cpp +++ b/src/system/boot/platform/u-boot/menu.cpp @@ -60,7 +60,7 @@ platform_add_menus(Menu *menu) } -void +void platform_update_menu_item(Menu *menu, MenuItem *item) { platform_generic_update_text_menu_item(menu, item); @@ -73,3 +73,10 @@ platform_run_menu(Menu *menu) platform_generic_run_text_menu(menu); } + +void +platform_get_user_input_text(Menu *menu, const char *input, char *buffer, + size_t bufferSize) +{ + platform_generic_get_user_input_text(menu, prompt, buffer, bufferSize); +}