From 44df371a4648b79e63e09af9bd0b8f4d621f37d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 1 Oct 2003 01:29:42 +0000
Subject: [PATCH] Updated to match the new boot loader platform API (boot() was
 renamed to main()). platform_user_menu_requested() always returns "false" for
 now.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4890 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/boot/platform/openfirmware/Jamfile |  1 +
 src/kernel/boot/platform/openfirmware/misc.c  | 19 +++++++++++++++++++
 src/kernel/boot/platform/openfirmware/start.c |  7 +++----
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 src/kernel/boot/platform/openfirmware/misc.c

diff --git a/src/kernel/boot/platform/openfirmware/Jamfile b/src/kernel/boot/platform/openfirmware/Jamfile
index cc687d4597..bfdfa840d1 100644
--- a/src/kernel/boot/platform/openfirmware/Jamfile
+++ b/src/kernel/boot/platform/openfirmware/Jamfile
@@ -7,6 +7,7 @@ KernelMergeObject boot_platform_openfirmware.o :
 	<$(SOURCE_GRIST)>start.c
 	<$(SOURCE_GRIST)>openfirmware.c
 	<$(SOURCE_GRIST)>debug.c
+	<$(SOURCE_GRIST)>misc.c
 	<$(SOURCE_GRIST)>Handle.cpp
 	<$(SOURCE_GRIST)>devices.cpp
 	<$(SOURCE_GRIST)>console.cpp
diff --git a/src/kernel/boot/platform/openfirmware/misc.c b/src/kernel/boot/platform/openfirmware/misc.c
new file mode 100644
index 0000000000..700c259209
--- /dev/null
+++ b/src/kernel/boot/platform/openfirmware/misc.c
@@ -0,0 +1,19 @@
+/*
+** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Distributed under the terms of the OpenBeOS License.
+*/
+
+
+#include <boot/platform.h>
+#include <boot/stdio.h>
+
+#include "openfirmware.h"
+
+
+bool
+platform_user_menu_requested(void)
+{
+	// ToDo: implement this for real - trigger on space?
+	return false;
+}
+
diff --git a/src/kernel/boot/platform/openfirmware/start.c b/src/kernel/boot/platform/openfirmware/start.c
index 3eb627ef8f..94868d0348 100644
--- a/src/kernel/boot/platform/openfirmware/start.c
+++ b/src/kernel/boot/platform/openfirmware/start.c
@@ -15,7 +15,7 @@
 
 void _start(uint32 _unused1, uint32 _unused2, void *openFirmwareEntry);
 void start(void *openFirmwareEntry);
-int boot(stage2_args *args);
+int main(stage2_args *args);
 
 // GCC defined globals
 extern void (*__ctor_list)(void);
@@ -62,10 +62,9 @@ start(void *openFirmwareEntry)
 	of_init(openFirmwareEntry);
 	console_init();
 
-	boot(NULL);
-		// if everything wents fine, boot() never returns
+	main(NULL);
+		// if everything wents fine, main() never returns
 
 	of_exit();
 }
 
-