Index: kernel/arch/ia32/include/arch.h =================================================================== --- kernel/arch/ia32/include/arch.h (revision c22e964a598c0c20654391f6a11e7333830cbf37) +++ kernel/arch/ia32/include/arch.h (revision 5d8d71ebf89df6dbc2bd7f5a55aa3d4c73a286cd) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2005 Martin Decky + * Copyright (c) 2009 Martin Decky * All rights reserved. * @@ -36,7 +36,7 @@ #define KERN_ia32_ARCH_H_ -#include +#include -extern void arch_pre_main(uint32_t signature, const mb_info_t *mi); +extern void arch_pre_main(uint32_t, const multiboot_info_t *); #endif Index: kernel/arch/ia32/include/boot/boot.h =================================================================== --- kernel/arch/ia32/include/boot/boot.h (revision c22e964a598c0c20654391f6a11e7333830cbf37) +++ kernel/arch/ia32/include/boot/boot.h (revision 5d8d71ebf89df6dbc2bd7f5a55aa3d4c73a286cd) @@ -43,10 +43,9 @@ #define MULTIBOOT_HEADER_FLAGS 0x00010003 -#define MULTIBOOT_LOADER_MAGIC 0x2BADB002 - #ifndef __ASM__ #ifdef CONFIG_SMP +/* This is only a symbol so the type is dummy. Obtain the value using &. */ extern int _hardcoded_unmapped_size; Index: kernel/arch/ia32/include/boot/multiboot.h =================================================================== --- kernel/arch/ia32/include/boot/multiboot.h (revision c22e964a598c0c20654391f6a11e7333830cbf37) +++ (revision ) @@ -1,90 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - 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. - */ - -/** @addtogroup ia32 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia32_MULTIBOOT_H__ -#define KERN_ia32_MULTIBOOT_H_ - -#include -#include - -/** Multiboot mod structure */ -typedef struct { - uintptr_t start; - uintptr_t end; - char *string; - uint32_t reserved; -} __attribute__ ((packed)) mb_mod_t; - -/** Multiboot mmap structure */ -typedef struct { - uint32_t size; - e820memmap_t mm_info; -} __attribute__ ((packed)) mb_mmap_t; - -/** Multiboot information structure */ -typedef struct { - uint32_t flags; - uintptr_t mem_lower; - uintptr_t mem_upper; - - uint32_t boot_device; - char *cmdline; - - uint32_t mods_count; - mb_mod_t *mods_addr; - - uint32_t syms[4]; - - uint32_t mmap_length; - mb_mmap_t *mmap_addr; - - /* ... */ -} __attribute__ ((packed)) mb_info_t; - -enum mb_info_flags { - MBINFO_FLAGS_MEM = 0x01, - MBINFO_FLAGS_BOOT = 0x02, - MBINFO_FLAGS_CMDLINE = 0x04, - MBINFO_FLAGS_MODS = 0x08, - MBINFO_FLAGS_SYMS1 = 0x10, - MBINFO_FLAGS_SYMS2 = 0x20, - MBINFO_FLAGS_MMAP = 0x40 - - /* ... */ -}; - -#endif - -/** @} - */ Index: kernel/arch/ia32/src/ia32.c =================================================================== --- kernel/arch/ia32/src/ia32.c (revision c22e964a598c0c20654391f6a11e7333830cbf37) +++ kernel/arch/ia32/src/ia32.c (revision 5d8d71ebf89df6dbc2bd7f5a55aa3d4c73a286cd) @@ -41,4 +41,5 @@ #include +#include #include #include @@ -67,6 +68,4 @@ #include #include -#include -#include #ifdef CONFIG_SMP @@ -74,104 +73,13 @@ #endif -/** Extract command name from the multiboot module command line. - * - * @param buf Destination buffer (will always null-terminate). - * @param n Size of destination buffer. - * @param cmd_line Input string (the command line). - * - */ -static void extract_command(char *buf, size_t n, const char *cmd_line) -{ - const char *start, *end, *cp; - size_t max_len; - - /* Find the first space. */ - end = strchr(cmd_line, ' '); - if (end == NULL) - end = cmd_line + strlen(cmd_line); - - /* - * Find last occurence of '/' before 'end'. If found, place start at - * next character. Otherwise, place start at beginning of buffer. - */ - cp = end; - start = buf; - while (cp != start) { - if (*cp == '/') { - start = cp + 1; - break; - } - --cp; - } - - /* Copy the command and null-terminate the string. */ - max_len = min(n - 1, (size_t) (end - start)); - strncpy(buf, start, max_len + 1); - buf[max_len] = '\0'; -} - -/** C part of ia32 boot sequence. +/** Perform ia32-specific initialization before main_bsp() is called. * * @param signature Should contain the multiboot signature. * @param mi Pointer to the multiboot information structure. */ -void arch_pre_main(uint32_t signature, const mb_info_t *mi) -{ - uint32_t flags; - mb_mod_t *mods; - uint32_t i; - - if (signature == MULTIBOOT_LOADER_MAGIC) - flags = mi->flags; - else { - /* No multiboot info available. */ - flags = 0; - } - - /* Copy module information. */ - - if ((flags & MBINFO_FLAGS_MODS) != 0) { - init.cnt = mi->mods_count; - mods = mi->mods_addr; - - for (i = 0; i < init.cnt; i++) { - init.tasks[i].addr = mods[i].start + 0x80000000; - init.tasks[i].size = mods[i].end - mods[i].start; - - /* Copy command line, if available. */ - if (mods[i].string) { - extract_command(init.tasks[i].name, - CONFIG_TASK_NAME_BUFLEN, - mods[i].string); - } else - init.tasks[i].name[0] = '\0'; - } - } else - init.cnt = 0; - - /* Copy memory map. */ - - int32_t mmap_length; - mb_mmap_t *mme; - uint32_t size; - - if ((flags & MBINFO_FLAGS_MMAP) != 0) { - mmap_length = mi->mmap_length; - mme = mi->mmap_addr; - e820counter = 0; - - i = 0; - while (mmap_length > 0) { - e820table[i++] = mme->mm_info; - - /* Compute address of next structure. */ - size = sizeof(mme->size) + mme->size; - mme = ((void *) mme) + size; - mmap_length -= size; - } - - e820counter = i; - } else - e820counter = 0; +void arch_pre_main(uint32_t signature, const multiboot_info_t *mi) +{ + /* Parse multiboot information obtained from the bootloader. */ + multiboot_info_parse(signature, mi); #ifdef CONFIG_SMP