WebSVN – HelenOS – Diff – /trunk/kernel/genarch/src/multiboot/multiboot.c

 /*
- * Copyright (c) 2001-2004 Jakub Jermar
  * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2009 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:
  * 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
+/** @addtogroup genarch
  * @{
  */
 /** @file
  */
-#include <arch.h>
+#include <genarch/multiboot/multiboot.h>
 #include <arch/types.h>
-#include <arch/pm.h>
+#include <typedefs.h>
-#include <genarch/drivers/legacy/ia32/io.h>
-#include <genarch/drivers/ega/ega.h>
-#include <arch/drivers/vesa.h>
-#include <genarch/kbd/i8042.h>
-#include <arch/drivers/i8254.h>
-#include <arch/drivers/i8259.h>
-#include <arch/context.h>
 #include <config.h>
-#include <arch/interrupt.h>
-#include <arch/asm.h>
-#include <genarch/acpi/acpi.h>
-#include <arch/bios/bios.h>
-#include <interrupt.h>
-#include <ddi/irq.h>
-#include <arch/debugger.h>
-#include <proc/thread.h>
-#include <syscall/syscall.h>
-#include <console/console.h>
-#include <ddi/device.h>
-#include <sysinfo/sysinfo.h>
-#include <arch/boot/boot.h>
 #include <string.h>
 #include <macros.h>
-#ifdef CONFIG_SMP
-#include <arch/smp/apic.h>
-#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).
     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.
+/** Parse multiboot information structure.
+ *
+ * If @a signature does not contain a valid multiboot signature,
+ * assumes no multiboot information is available.
+ *
  * @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)
+void multiboot_info_parse(uint32_t signature, const multiboot_info_t *mi)
+{
     uint32_t flags;
-    mb_mod_t *mods;
+    multiboot_mod_t *mods;
     uint32_t i;
     if (signature == MULTIBOOT_LOADER_MAGIC)
         flags = mi->flags;
     else {
     /* Copy module information. */
     if ((flags & MBINFO_FLAGS_MODS) != 0) {
         init.cnt = mi->mods_count;
-        mods = mi->mods_addr;
+        mods = (multiboot_mod_t *) MULTIBOOT_PTR(mi->mods_addr);
         for (i = 0; i < init.cnt; i++) {
-            init.tasks[i].addr = mods[i].start + 0x80000000;
+            init.tasks[i].addr = PA2KA(mods[i].start);
             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);
+                    MULTIBOOT_PTR(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;
+    multiboot_mmap_t *mme;
     uint32_t size;
     if ((flags & MBINFO_FLAGS_MMAP) != 0) {
         mmap_length = mi->mmap_length;
-        mme = mi->mmap_addr;
+        mme = MULTIBOOT_PTR(mi->mmap_addr);
         e820counter = 0;
         i = 0;
         while (mmap_length > 0) {
             e820table[i++] = mme->mm_info;
+        }
         e820counter = i;
     } else
         e820counter = 0;
-#ifdef CONFIG_SMP
-    /* Copy AP bootstrap routines below 1 MB. */
-    memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET,
-        (size_t) &_hardcoded_unmapped_size);
-#endif
-}
-void arch_pre_mm_init(void)
-{
-    pm_init();
-    if (config.cpu_active == 1) {
-        interrupt_init();
-        bios_init();
-        /* PIC */
-        i8259_init();
-    }
-}
-void arch_post_mm_init(void)
-{
-    if (config.cpu_active == 1) {
-        /* Initialize IRQ routing */
-        irq_init(IRQ_COUNT, IRQ_COUNT);
-        /* hard clock */
-        i8254_init();
-#ifdef CONFIG_FB
-        if (vesa_present())
-            vesa_init();
-        else
-#endif
-            ega_init(EGA_BASE, EGA_VIDEORAM);   /* video */
-        /* Enable debugger */
-        debugger_init();
-        /* Merge all memory zones to 1 big zone */
-        zone_merge_all();
-    }
-}
-void arch_post_cpu_init()
-{
-#ifdef CONFIG_SMP
-        if (config.cpu_active > 1) {
-        l_apic_init();
-        l_apic_debug();
-    }
-#endif
-}
-void arch_pre_smp_init(void)
-{
-    if (config.cpu_active == 1) {
-#ifdef CONFIG_SMP
-        acpi_init();
-#endif /* CONFIG_SMP */
-    }
-}
-void arch_post_smp_init(void)
-{
-    devno_t devno = device_assign_devno();
-    /* keyboard controller */
-    (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
-    /*
-     * This is the necessary evil until the userspace driver is entirely
-     * self-sufficient.
-     */
-    sysinfo_set_item_val("kbd", NULL, true);
-    sysinfo_set_item_val("kbd.devno", NULL, devno);
-    sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
-}
-void calibrate_delay_loop(void)
-{
-    i8254_calibrate_delay_loop();
-    if (config.cpu_active == 1) {
-        /*
-         * This has to be done only on UP.
-         * On SMP, i8254 is not used for time keeping and its interrupt pin remains masked.
-         */
-        i8254_normal_operation();
-    }
-}
-/** Set thread-local-storage pointer
- *
- * TLS pointer is set in GS register. That means, the GS contains
- * selector, and the descriptor->base is the correct address.
- */
-unative_t sys_tls_set(unative_t addr)
-{
-    THREAD->arch.tls = addr;
-    set_tls_desc(addr);
-    return 0;
-}
-/** Acquire console back for kernel
- *
- */
-void arch_grab_console(void)
-{
-#ifdef CONFIG_FB
-    vesa_redraw();
-#else
-    ega_redraw();
-#endif
-}
-/** Return console to userspace
- *
- */
-void arch_release_console(void)
-{
-}
-/** Construct function pointer
- *
- * @param fptr   function pointer structure
- * @param addr   function address
- * @param caller calling function address
- *
- * @return address of the function pointer
- *
- */
-void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
-{
-    return addr;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/multiboot/multiboot.c – Rev 4015 → 4022