From 8b8fd1c31ccc670c67653c84020b397742f43ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 3 May 2003 15:59:29 +0000 Subject: [PATCH] Removed the stage2 related headers (they are now in boot/). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3150 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/bootdir.h | 66 -------------------------- headers/private/kernel/stage2.h | 44 ----------------- headers/private/kernel/stage2_struct.h | 22 --------- 3 files changed, 132 deletions(-) delete mode 100755 headers/private/kernel/bootdir.h delete mode 100755 headers/private/kernel/stage2.h delete mode 100755 headers/private/kernel/stage2_struct.h diff --git a/headers/private/kernel/bootdir.h b/headers/private/kernel/bootdir.h deleted file mode 100755 index cbe1842509..0000000000 --- a/headers/private/kernel/bootdir.h +++ /dev/null @@ -1,66 +0,0 @@ -/* $Id: bootdir.h,v 1.1 2002/07/09 12:24:34 ejakowatz Exp $ -** -** Copyright 1998 Brian J. Swetland -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions, and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions, and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _NEWOS_BOOT_H_ -#define _NEWOS_BOOT_H_ - -#define BOOTDIR_NAMELEN 32 -#define BOOTDIR_MAX_ENTRIES 64 -#define BOOTDIR_DIRECTORY "SBBB/Directory" - -typedef struct { - char be_name[BOOTDIR_NAMELEN]; /* name of loaded object, zero terminated */ - int be_offset; /* offset of object relative to the start of boot_dir */ - int be_type; /* object type designator */ - int be_size; /* size of loaded object (pages) */ - int be_vsize; /* size loaded object should occupy when mapped in */ - int be_extra0; - int be_extra1; - int be_extra2; - int be_extra3; -} boot_entry; - -typedef struct { - boot_entry bd_entry[BOOTDIR_MAX_ENTRIES]; -} boot_dir; - -/* void _start(uint32 mem, char *params, boot_dir *bd); */ - -#define BE_TYPE_NONE 0 /* empty entry */ -#define BE_TYPE_DIRECTORY 1 /* directory (entry 0) */ -#define BE_TYPE_BOOTSTRAP 2 /* bootstrap code object (entry 1) */ -#define BE_TYPE_CODE 3 /* executable code object */ -#define BE_TYPE_DATA 4 /* raw data object */ -#define BE_TYPE_ELF32 5 /* 32bit ELF object */ - -/* for BE_TYPE_CODE */ -#define be_code_vaddr be_extra0 /* virtual address (rel offset 0) */ -#define be_code_ventr be_extra1 /* virtual entry point (rel offset 0) */ - -#endif - diff --git a/headers/private/kernel/stage2.h b/headers/private/kernel/stage2.h deleted file mode 100755 index afd2a4bbf3..0000000000 --- a/headers/private/kernel/stage2.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ - -#ifndef _KERNEL_STAGE2_H -#define _KERNEL_STAGE2_H - -// this file declares stuff like addr_range, MAX_*, etc. -#include -#include - - -// kernel args -typedef struct ka { - uint32 cons_line; - char *str; - addr_range bootdir_addr; - addr_range kernel_seg0_addr; - addr_range kernel_seg1_addr; - addr_range kernel_dynamic_section_addr; - uint32 num_phys_mem_ranges; - - addr_range phys_mem_range[MAX_PHYS_MEM_ADDR_RANGE]; - uint32 num_phys_alloc_ranges; - addr_range phys_alloc_range[MAX_PHYS_ALLOC_ADDR_RANGE]; - uint32 num_virt_alloc_ranges; - addr_range virt_alloc_range[MAX_VIRT_ALLOC_ADDR_RANGE]; - uint32 num_cpus; - addr_range cpu_kstack[MAX_BOOT_CPUS]; - - arch_kernel_args arch_args; - - struct framebuffer { - int enabled; - int x_size; - int y_size; - int bit_depth; - int already_mapped; - addr_range mapping; - } fb; -} kernel_args; - -#endif /* _KERNEL_STAGE2_H */ diff --git a/headers/private/kernel/stage2_struct.h b/headers/private/kernel/stage2_struct.h deleted file mode 100755 index f91cefc344..0000000000 --- a/headers/private/kernel/stage2_struct.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ -#ifndef _NEWOS_BOOT_STAGE2_STRUCT_H -#define _NEWOS_BOOT_STAGE2_STRUCT_H - -#include - -// must match SMP_MAX_CPUS in arch_smp.h -#define MAX_BOOT_CPUS 4 -#define MAX_PHYS_MEM_ADDR_RANGE 4 -#define MAX_VIRT_ALLOC_ADDR_RANGE 4 -#define MAX_PHYS_ALLOC_ADDR_RANGE 4 - -typedef struct ar { - uint32 start; - uint32 size; -} addr_range; - -#endif -