Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26729 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-08-02 14:52:18 +00:00
parent 02c8f6c89d
commit 11790544cd
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,9 @@
/*! This is main - initializes the kernel and launches the Bootscript */ /*! This is main - initializes the kernel and launches the Bootscript */
#include <string.h>
#include <FindDirectory.h>
#include <OS.h> #include <OS.h>
#include <arch/platform.h> #include <arch/platform.h>
@ -23,7 +26,6 @@
#include <elf.h> #include <elf.h>
#include <fs/devfs.h> #include <fs/devfs.h>
#include <fs/KPath.h> #include <fs/KPath.h>
#include <FindDirectory.h>
#include <int.h> #include <int.h>
#include <kdevice_manager.h> #include <kdevice_manager.h>
#include <kdriver_settings.h> #include <kdriver_settings.h>
@ -49,8 +51,6 @@
#include <vm.h> #include <vm.h>
#include <boot/kernel_args.h> #include <boot/kernel_args.h>
#include <string.h>
#include "vm/VMAnonymousCache.h" #include "vm/VMAnonymousCache.h"
@ -69,18 +69,8 @@ static uint32 sCpuRendezvous2;
static int32 main2(void *); static int32 main2(void *);
#ifdef __cplusplus
extern "C" {
#endif
extern int _start(kernel_args *bootKernelArgs, int cpu); extern "C" int
/* keep compiler happy */
#ifdef __cplusplus
} /* extern "C" */
#endif
int
_start(kernel_args *bootKernelArgs, int currentCPU) _start(kernel_args *bootKernelArgs, int currentCPU)
{ {
if (bootKernelArgs->kernel_args_size != sizeof(kernel_args) if (bootKernelArgs->kernel_args_size != sizeof(kernel_args)
@ -110,8 +100,6 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
// if we're not a boot cpu, spin here until someone wakes us up // if we're not a boot cpu, spin here until someone wakes us up
if (smp_trap_non_boot_cpus(currentCPU)) { if (smp_trap_non_boot_cpus(currentCPU)) {
thread_id thread;
// init platform // init platform
arch_platform_init(&sKernelArgs); arch_platform_init(&sKernelArgs);
@ -214,7 +202,8 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
// start a thread to finish initializing the rest of the system // start a thread to finish initializing the rest of the system
TRACE("starting main2 thread\n"); TRACE("starting main2 thread\n");
thread = spawn_kernel_thread(&main2, "main2", B_NORMAL_PRIORITY, NULL); thread_id thread = spawn_kernel_thread(&main2, "main2",
B_NORMAL_PRIORITY, NULL);
TRACE("resuming main2 thread...\n"); TRACE("resuming main2 thread...\n");
resume_thread(thread); resume_thread(thread);
} else { } else {
@ -244,6 +233,7 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
return 0; return 0;
} }
static int32 static int32
main2(void *unused) main2(void *unused)
{ {