josh/hos
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

changed k_bootstrap from C to C++ source file

Browse Source 
git-svn-id: svn://anubis/hos/trunk@33 5b3e749e-e535-0410-8002-a9bb6afbdfca
This commit is contained in:
josh 2009-07-01 21:17:24 +00:00
parent db192f6d36
commit bfb4f3bdd0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/boot/k_bootstrap.c → kernel/boot/k_bootstrap.cc
View File

@ -7,6 +7,7 @@
#define DEBUG_LETTER(col,chr) *(u16_t *)(CONSOLE_MEMORY + 160 * 8 + (col) * 2) \ #define DEBUG_LETTER(col,chr) *(u16_t *)(CONSOLE_MEMORY + 160 * 8 + (col) * 2) \
= 0x0700 | (chr) = 0x0700 | (chr)
extern "C" {
u8_t bootstrap_stack[4096]; 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); 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; mm_record_mmap_entry(mmap);
for (sz = 0; sz < mb_info->mmap_length; sz += mmap->size + 4) 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'); DEBUG_LETTER(3, 'd');
@ -49,3 +47,5 @@ u32_t k_bootstrap(mb_info_t * mb_info, u32_t mb_magic)
return 0; return 0;
} }
} /* extern "C" */