From 0e67fb5a42db324837f093d80ee82b13241dec77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 15 Jun 2004 16:55:27 +0000 Subject: [PATCH] Now maintains the kernel_args size and version fields. Removed unused code. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7987 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/loader/main.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/kernel/boot/loader/main.cpp b/src/kernel/boot/loader/main.cpp index 692ab45478..2feec70855 100644 --- a/src/kernel/boot/loader/main.cpp +++ b/src/kernel/boot/loader/main.cpp @@ -1,5 +1,5 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. +** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the OpenBeOS License. */ @@ -92,6 +92,10 @@ main(stage2_args *args) register_boot_file_system(volume); load_modules(args, volume); + // set up kernel args version info + gKernelArgs.kernel_args_size = sizeof(kernel_args); + gKernelArgs.version = CURRENT_KERNEL_ARGS_VERSION; + // ToDo: cleanup, heap_release() etc. platform_start_kernel(); } @@ -101,18 +105,3 @@ out: heap_release(args); return 0; } - -#if 0 - -void -load_kernel(void *deviceHandle) -{ - void *handle = open(deviceHandle, "system/kernel"); - if (handle == NULL) - panic("Could not open kernel from boot device!\n"); - - /* load kernel into memory and relocate it */ -} - -#endif -