From b747c3b7913789eb7f3f9a8de4ee21b0472f0e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 21 Apr 2004 22:58:02 +0000 Subject: [PATCH] Updated to match the changes in the boot loader. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7291 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kernel/boot/loader/Jamfile | 5 ++++- src/tests/kernel/boot/loader/platform_devices.cpp | 4 ++-- src/tests/kernel/boot/loader/platform_start.cpp | 12 +++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/kernel/boot/loader/Jamfile index aaa5b005e5..b153b278d5 100644 --- a/src/tests/kernel/boot/loader/Jamfile +++ b/src/tests/kernel/boot/loader/Jamfile @@ -18,6 +18,7 @@ ObjectsDefines elf.cpp menu.cpp loader.cpp + kernel_args.cpp # partitions amiga_rdb.cpp @@ -49,7 +50,7 @@ ObjectsDefines # SubDirC++Flags -include /usr/include/stdio.h ; } else { # SubDirC++Flags -include /boot/develop/headers/posix/stdio.h ; - SubDirC++Flags $(defines) -DHAVE_READ_POS=1 ; # -fcheck-memory-usage -D_NO_INLINE_ASM ; + SubDirC++Flags $(defines) -DHAVE_READ_POS=1 -fcheck-memory-usage -D_NO_INLINE_ASM ; } } @@ -71,6 +72,7 @@ SimpleTest BootLoaderTest : elf.cpp menu.cpp loader.cpp + kernel_args.cpp # partitioning systems amiga_rdb.cpp @@ -97,6 +99,7 @@ SEARCH on [ FGristFiles main.cpp vfs.cpp partitions.cpp heap.cpp RootFileSystem.cpp elf.cpp menu.cpp loader.cpp + kernel_args.cpp ] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ; # partitioning system modules diff --git a/src/tests/kernel/boot/loader/platform_devices.cpp b/src/tests/kernel/boot/loader/platform_devices.cpp index e0b410a0fd..ad4b856352 100644 --- a/src/tests/kernel/boot/loader/platform_devices.cpp +++ b/src/tests/kernel/boot/loader/platform_devices.cpp @@ -91,8 +91,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/tests/kernel/boot/loader/platform_start.cpp b/src/tests/kernel/boot/loader/platform_start.cpp index 9ee359d0a4..28c860cfb8 100644 --- a/src/tests/kernel/boot/loader/platform_start.cpp +++ b/src/tests/kernel/boot/loader/platform_start.cpp @@ -1,13 +1,23 @@ /* -** 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 extern "C" int boot_main(struct stage2_args *args); +extern addr_t gKernelEntry; + + +void +platform_start_kernel(void) +{ + printf("*** jump to kernel at %p ***\n*** program exits.\n", (void *)gKernelEntry); + exit(0); +} int