From bfb4f3bdd035ba960cb82ab8e3ca2abe89079368 Mon Sep 17 00:00:00 2001 From: josh Date: Wed, 1 Jul 2009 21:17:24 +0000 Subject: [PATCH] changed k_bootstrap from C to C++ source file git-svn-id: svn://anubis/hos/trunk@33 5b3e749e-e535-0410-8002-a9bb6afbdfca --- kernel/boot/{k_bootstrap.c => k_bootstrap.cc} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename kernel/boot/{k_bootstrap.c => k_bootstrap.cc} (82%) diff --git a/kernel/boot/k_bootstrap.c b/kernel/boot/k_bootstrap.cc similarity index 82% rename from kernel/boot/k_bootstrap.c rename to kernel/boot/k_bootstrap.cc index 81a55d6..75c2a1d 100644 --- a/kernel/boot/k_bootstrap.c +++ b/kernel/boot/k_bootstrap.cc @@ -7,6 +7,7 @@ #define DEBUG_LETTER(col,chr) *(u16_t *)(CONSOLE_MEMORY + 160 * 8 + (col) * 2) \ = 0x0700 | (chr) +extern "C" { u8_t bootstrap_stack[4096]; @@ -29,13 +30,10 @@ u32_t k_bootstrap(mb_info_t * mb_info, u32_t mb_magic) } mb_mmap_t * mmap = (mb_mmap_t *) (mb_info->mmap_addr + HOS_KERNEL_OFFSET - 4); + for (unsigned int sz = 0; sz < mb_info->mmap_length; sz += mmap->size + 4) { - int sz; - for (sz = 0; sz < mb_info->mmap_length; sz += mmap->size + 4) - { - mm_record_mmap_entry(mmap); - mmap = (mb_mmap_t *) (((u32_t)mmap) + mmap->size + 4); - } + mm_record_mmap_entry(mmap); + mmap = (mb_mmap_t *) (((u32_t)mmap) + mmap->size + 4); } DEBUG_LETTER(3, 'd'); @@ -49,3 +47,5 @@ u32_t k_bootstrap(mb_info_t * mb_info, u32_t mb_magic) return 0; } + +} /* extern "C" */