The boot loader test now builds again.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8186 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-27 17:50:52 +00:00
parent bbcb8882e9
commit 3bdc0a2298
5 changed files with 59 additions and 8 deletions
+1
View File
@@ -60,6 +60,7 @@ SimpleTest BootLoaderTest :
platform_debug.cpp platform_debug.cpp
platform_devices.cpp platform_devices.cpp
platform_heap.cpp platform_heap.cpp
platform_menu.cpp
platform_misc.cpp platform_misc.cpp
platform_mmu.cpp platform_mmu.cpp
Handle.cpp Handle.cpp
@@ -10,6 +10,7 @@ ObjectsDefines
bfs.cpp bfs.cpp
Directory.cpp Directory.cpp
File.cpp File.cpp
Link.cpp
Stream.cpp Stream.cpp
BPlusTree.cpp BPlusTree.cpp
: :
@@ -21,6 +22,7 @@ KernelStaticLibrary boottest_bfs.a :
bfs.cpp bfs.cpp
Directory.cpp Directory.cpp
File.cpp File.cpp
Link.cpp
Stream.cpp Stream.cpp
BPlusTree.cpp BPlusTree.cpp
; ;
@@ -28,6 +30,6 @@ KernelStaticLibrary boottest_bfs.a :
# Tell Jam where to find the sources # Tell Jam where to find the sources
SEARCH on [ FGristFiles 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 ] ; ] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems bfs ] ;
@@ -0,0 +1,27 @@
/*
** Copyright 2004, Axel Dörfler, [email protected]. 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)
{
}
+24 -5
View File
@@ -1,15 +1,34 @@
/* /*
** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved. ** Copyright 2003-2004, Axel Dörfler, [email protected]. All rights reserved.
** Distributed under the terms of the OpenBeOS License. ** Distributed under the terms of the Haiku License.
*/ */
#include <boot/platform.h> #include <boot/platform.h>
bool uint32
platform_user_menu_requested(void) 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;
} }
@@ -5,17 +5,19 @@
#include <boot/platform.h> #include <boot/platform.h>
#include <boot/kernel_args.h>
#include <stdio.h> #include <stdio.h>
extern "C" int boot_main(struct stage2_args *args); extern "C" int boot_main(struct stage2_args *args);
extern addr_t gKernelEntry; extern struct kernel_args gKernelArgs;
void void
platform_start_kernel(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); exit(0);
} }