Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-02-01 11:15:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Added an explicit boot_splash_uninit(). Not really needed, but makes

Browse Source 
it clear when boot_splash_set_stage() must no longer be used.
* Free the memory associated with the kernel args before starting the
  init process. Unlike the original TODO stated there are quite a few
  more users of the kernel args (including the boot splash screen),
  hence we can't really do that earlier, unless we decide to copy the
  data over to the kernel heap. 


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26344 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-07-09 15:25:01 +00:00
parent fa0a5cd0e8
commit 383a9ac435
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/kernel/boot_splash.h
View File

@ -29,6 +29,7 @@ extern "C" {
#endif
void boot_splash_init(uint8 * boot_splash);
void boot_splash_uninit(void);
void boot_splash_set_stage(int stage);
#ifdef __cplusplus

7
src/system/kernel/boot_splash.cpp
View File

@ -185,6 +185,13 @@ boot_splash_init(uint8 *boot_splash)
}
void
boot_splash_uninit(void)
{
sInfo = NULL;
}
void
boot_splash_set_stage(int stage)
{

24
src/system/kernel/main.cpp
View File

@ -245,17 +245,6 @@ main2(void *unused)
boot_splash_set_stage(BOOT_SPLASH_STAGE_1_INIT_MODULES);
module_init(&sKernelArgs);
// ToDo: the preloaded image debug data is placed in the kernel args, and
// thus, if they are enabled, the kernel args shouldn't be freed, so
// that we don't have to copy them.
// What is yet missing is a mechanism that controls this (via driver settings).
if (0) {
// module_init() is supposed to be the last user of the kernel args
// Note: don't confuse the kernel_args structure (which is never freed)
// with the kernel args ranges it contains (and which are freed here).
vm_free_kernel_args(&sKernelArgs);
}
// init userland debugging
TRACE("Init Userland debugging\n");
init_user_debug();
@ -297,9 +286,16 @@ main2(void *unused)
device_manager_init_post_modules(&sKernelArgs);
boot_splash_set_stage(BOOT_SPLASH_STAGE_7_RUN_BOOT_SCRIPT);
// kernel_args_free(sKernelArgs.boot_splash);
// NOTE: We could introduce a syscall to draw more icons indicating
// stages in the boot script itself. Then we should not free the image.
boot_splash_uninit();
// NOTE: We could introduce a syscall to draw more icons indicating
// stages in the boot script itself. Then we should not free the image.
// In that case we should copy it over to the kernel heap, so that we
// can still free the kernel args.
// The boot splash screen is the last user of the kernel args.
// Note: don't confuse the kernel_args structure (which is never freed)
// with the kernel args ranges it contains (and which are freed here).
vm_free_kernel_args(&sKernelArgs);
// start the init process
{