From bb59e8a636c58483876700612934ee2529ea068a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 24 Nov 2004 16:23:48 +0000 Subject: [PATCH] The boot loader test now builds again fine. Removed -fcheck-memory-usage for now. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10211 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kernel/boot/loader/Jamfile | 8 ++++---- src/tests/kernel/boot/loader/platform_devices.cpp | 12 +++++++++--- src/tests/kernel/boot/loader/platform_start.cpp | 14 +++++++++++--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/kernel/boot/loader/Jamfile index ca8d431908..29e69cbb00 100644 --- a/src/tests/kernel/boot/loader/Jamfile +++ b/src/tests/kernel/boot/loader/Jamfile @@ -48,10 +48,9 @@ ObjectsDefines defines = [ FDefines $(defines) ] ; if $(OS) = "LINUX" { - # 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 ; + SubDirC++Flags $(defines) -DHAVE_READ_POS=1 -D_NO_INLINE_ASM ; } } @@ -81,6 +80,7 @@ SimpleTest BootLoaderTest : apple.cpp intel.cpp PartitionMap.cpp + PartitionMapParser.cpp # utility functions - Dano has a strlcpy() function in libroot.so, while R5 has not list.c @@ -112,7 +112,7 @@ SEARCH on [ FGristFiles amiga_rdb.cpp ] SEARCH on [ FGristFiles apple.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems apple ] ; -SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp ] +SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ; diff --git a/src/tests/kernel/boot/loader/platform_devices.cpp b/src/tests/kernel/boot/loader/platform_devices.cpp index ad4b856352..6eeb963928 100644 --- a/src/tests/kernel/boot/loader/platform_devices.cpp +++ b/src/tests/kernel/boot/loader/platform_devices.cpp @@ -1,7 +1,7 @@ /* -** 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. + * Distributed under the terms of the MIT License. + */ #include "Handle.h" @@ -116,3 +116,9 @@ platform_add_block_devices(struct stage2_args *args, NodeList *list) return B_OK; } + +status_t +platform_register_boot_device(Node *device) +{ + return B_OK; +} diff --git a/src/tests/kernel/boot/loader/platform_start.cpp b/src/tests/kernel/boot/loader/platform_start.cpp index 5ddae8bf56..5dc222652c 100644 --- a/src/tests/kernel/boot/loader/platform_start.cpp +++ b/src/tests/kernel/boot/loader/platform_start.cpp @@ -1,7 +1,7 @@ /* -** Copyright 2003-2004, 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. + * Distributed under the terms of the MIT License. + */ #include @@ -14,6 +14,14 @@ extern "C" int boot_main(struct stage2_args *args); extern struct kernel_args gKernelArgs; +void +platform_exit(void) +{ + puts("*** exit ***\n"); + exit(-1); +} + + void platform_start_kernel(void) {