From 3bdc0a229807cc8296aad5036835c322caa7532f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 27 Jun 2004 17:50:52 +0000
Subject: [PATCH] The boot loader test now builds again.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8186 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tests/kernel/boot/loader/Jamfile          |  1 +
 .../boot/loader/file_systems/bfs/Jamfile      |  4 ++-
 .../kernel/boot/loader/platform_menu.cpp      | 27 +++++++++++++++++
 .../kernel/boot/loader/platform_misc.cpp      | 29 +++++++++++++++----
 .../kernel/boot/loader/platform_start.cpp     |  6 ++--
 5 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 src/tests/kernel/boot/loader/platform_menu.cpp

diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/kernel/boot/loader/Jamfile
index b153b278d5..5e34e42123 100644
--- a/src/tests/kernel/boot/loader/Jamfile
+++ b/src/tests/kernel/boot/loader/Jamfile
@@ -60,6 +60,7 @@ SimpleTest BootLoaderTest :
 	platform_debug.cpp
 	platform_devices.cpp
 	platform_heap.cpp
+	platform_menu.cpp
 	platform_misc.cpp
 	platform_mmu.cpp
 	Handle.cpp
diff --git a/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile b/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile
index 5d964bca9b..963fa35bd3 100644
--- a/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile
+++ b/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile
@@ -10,6 +10,7 @@ ObjectsDefines
 	bfs.cpp
 	Directory.cpp
 	File.cpp
+	Link.cpp
 	Stream.cpp
 	BPlusTree.cpp
 	:
@@ -21,6 +22,7 @@ KernelStaticLibrary boottest_bfs.a :
 	bfs.cpp
 	Directory.cpp
 	File.cpp
+	Link.cpp
 	Stream.cpp
 	BPlusTree.cpp
 	;
@@ -28,6 +30,6 @@ KernelStaticLibrary boottest_bfs.a :
 # Tell Jam where to find the sources
 
 SEARCH on [ FGristFiles
-		bfs.cpp Directory.cpp File.cpp Stream.cpp BPlusTree.cpp
+		bfs.cpp Directory.cpp File.cpp Link.cpp Stream.cpp BPlusTree.cpp
 	] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems bfs ] ;
 
diff --git a/src/tests/kernel/boot/loader/platform_menu.cpp b/src/tests/kernel/boot/loader/platform_menu.cpp
new file mode 100644
index 0000000000..e4c48e0fa3
--- /dev/null
+++ b/src/tests/kernel/boot/loader/platform_menu.cpp
@@ -0,0 +1,27 @@
+/*
+** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+
+
+#include <boot/platform.h>
+#include <boot/menu.h>
+
+
+void
+platform_add_menus(Menu *menu)
+{
+}
+
+
+void
+platform_update_menu_item(Menu *menu, MenuItem *item)
+{
+}
+
+
+void
+platform_run_menu(Menu *menu)
+{
+}
+
diff --git a/src/tests/kernel/boot/loader/platform_misc.cpp b/src/tests/kernel/boot/loader/platform_misc.cpp
index f362425986..2c5464d233 100644
--- a/src/tests/kernel/boot/loader/platform_misc.cpp
+++ b/src/tests/kernel/boot/loader/platform_misc.cpp
@@ -1,15 +1,34 @@
 /*
-** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
+** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Distributed under the terms of the Haiku License.
 */
 
 
 #include <boot/platform.h>
 
 
-bool
-platform_user_menu_requested(void)
+uint32
+platform_boot_options(void)
+{
+	return 0;
+}
+
+
+status_t
+platform_init_video(void)
+{
+	return B_OK;
+}
+
+
+void
+platform_switch_to_logo(void)
+{
+}
+
+
+void
+platform_switch_to_text_mode(void)
 {
-	return false;
 }
 
diff --git a/src/tests/kernel/boot/loader/platform_start.cpp b/src/tests/kernel/boot/loader/platform_start.cpp
index 28c860cfb8..5ddae8bf56 100644
--- a/src/tests/kernel/boot/loader/platform_start.cpp
+++ b/src/tests/kernel/boot/loader/platform_start.cpp
@@ -5,17 +5,19 @@
 
 
 #include <boot/platform.h>
+#include <boot/kernel_args.h>
+
 #include <stdio.h>
 
 
 extern "C" int boot_main(struct stage2_args *args);
-extern addr_t gKernelEntry;
+extern struct kernel_args gKernelArgs;
 
 
 void
 platform_start_kernel(void)
 {
-	printf("*** jump to kernel at %p ***\n*** program exits.\n", (void *)gKernelEntry);
+	printf("*** jump to kernel at %p ***\n*** program exits.\n", (void *)gKernelArgs.kernel_image.elf_header.e_entry);
 	exit(0);
 }