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
This commit is contained in:
@@ -7,6 +7,7 @@ KernelMergeObject boot_platform_openfirmware.o :
|
|||||||
<$(SOURCE_GRIST)>start.c
|
<$(SOURCE_GRIST)>start.c
|
||||||
<$(SOURCE_GRIST)>openfirmware.c
|
<$(SOURCE_GRIST)>openfirmware.c
|
||||||
<$(SOURCE_GRIST)>debug.c
|
<$(SOURCE_GRIST)>debug.c
|
||||||
|
<$(SOURCE_GRIST)>misc.c
|
||||||
<$(SOURCE_GRIST)>Handle.cpp
|
<$(SOURCE_GRIST)>Handle.cpp
|
||||||
<$(SOURCE_GRIST)>devices.cpp
|
<$(SOURCE_GRIST)>devices.cpp
|
||||||
<$(SOURCE_GRIST)>console.cpp
|
<$(SOURCE_GRIST)>console.cpp
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
** Copyright 2003, Axel Dörfler, [email protected]. 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;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
void _start(uint32 _unused1, uint32 _unused2, void *openFirmwareEntry);
|
void _start(uint32 _unused1, uint32 _unused2, void *openFirmwareEntry);
|
||||||
void start(void *openFirmwareEntry);
|
void start(void *openFirmwareEntry);
|
||||||
int boot(stage2_args *args);
|
int main(stage2_args *args);
|
||||||
|
|
||||||
// GCC defined globals
|
// GCC defined globals
|
||||||
extern void (*__ctor_list)(void);
|
extern void (*__ctor_list)(void);
|
||||||
@@ -62,10 +62,9 @@ start(void *openFirmwareEntry)
|
|||||||
of_init(openFirmwareEntry);
|
of_init(openFirmwareEntry);
|
||||||
console_init();
|
console_init();
|
||||||
|
|
||||||
boot(NULL);
|
main(NULL);
|
||||||
// if everything wents fine, boot() never returns
|
// if everything wents fine, main() never returns
|
||||||
|
|
||||||
of_exit();
|
of_exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user