From 3a4a20a09ec6fad9c63cb9a77dfca2897620870f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 22 Apr 2004 01:13:20 +0000 Subject: [PATCH] Updated to match general boot loader changes. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7294 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/platform/openfirmware/console.cpp | 2 ++ src/kernel/boot/platform/openfirmware/devices.cpp | 6 +++--- src/kernel/boot/platform/openfirmware/start.c | 11 ++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/kernel/boot/platform/openfirmware/console.cpp b/src/kernel/boot/platform/openfirmware/console.cpp index 3e60dfe5b2..b28fb28b59 100644 --- a/src/kernel/boot/platform/openfirmware/console.cpp +++ b/src/kernel/boot/platform/openfirmware/console.cpp @@ -71,6 +71,8 @@ ConsoleHandle::WriteAt(void */*cookie*/, off_t /*pos*/, const void *buffer, size string += length; bufferSize -= length; } + + return string - (char *)buffer; } diff --git a/src/kernel/boot/platform/openfirmware/devices.cpp b/src/kernel/boot/platform/openfirmware/devices.cpp index 5bfa6c3165..16b8d81ed3 100644 --- a/src/kernel/boot/platform/openfirmware/devices.cpp +++ b/src/kernel/boot/platform/openfirmware/devices.cpp @@ -1,5 +1,5 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. +** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the OpenBeOS License. */ @@ -128,8 +128,8 @@ platform_get_boot_device(struct stage2_args *args, Node **_device) status_t -platform_get_boot_partition(struct stage2_args *args, NodeList *list, - boot::Partition **_partition) +platform_get_boot_partition(struct stage2_args *args, Node *device, + NodeList *list, boot::Partition **_partition) { NodeIterator iterator = list->Iterator(); boot::Partition *partition = NULL; diff --git a/src/kernel/boot/platform/openfirmware/start.c b/src/kernel/boot/platform/openfirmware/start.c index ac7e312945..2163353e36 100644 --- a/src/kernel/boot/platform/openfirmware/start.c +++ b/src/kernel/boot/platform/openfirmware/start.c @@ -1,10 +1,11 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. +** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the OpenBeOS License. */ #include +#include #include #include #include @@ -77,6 +78,14 @@ determine_machine(void) } +void +platform_start_kernel(void) +{ + printf("kernel entry at %p\n", (void *)gKernelEntry); + of_exit(); +} + + void _start(uint32 _unused1, uint32 _unused3, void *openFirmwareEntry) {