Changes in kernel/arch/amd64/src/amd64.c [88dfee7:f902d36] in mainline

File:

• kernel/arch/amd64/src/amd64.c (modified) (5 diffs)

kernel/arch/amd64/src/amd64.c

@@ -34 +34 @@
 
 #include <arch.h>
+
 #include <typedefs.h>
-#include <errno.h>
-#include <memstr.h>
-#include <interrupt.h>
-#include <console/console.h>
-#include <syscall/syscall.h>
-#include <sysinfo/sysinfo.h>
-#include <arch/bios/bios.h>
-#include <arch/boot/boot.h>
-#include <arch/debugger.h>
+
+#include <config.h>
+
+#include <proc/thread.h>
+#include <genarch/multiboot/multiboot.h>
+#include <genarch/drivers/legacy/ia32/io.h>
+#include <genarch/drivers/ega/ega.h>
+#include <arch/drivers/vesa.h>
+#include <genarch/drivers/i8042/i8042.h>
+#include <genarch/kbrd/kbrd.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
+#include <arch/boot/boot.h>
+
+#ifdef CONFIG_SMP
+#include <arch/smp/apic.h>
+#endif
+
+#include <arch/bios/bios.h>
+#include <arch/cpu.h>
+#include <print.h>
+#include <arch/cpuid.h>
+#include <genarch/acpi/acpi.h>
+#include <panic.h>
+#include <interrupt.h>
 #include <arch/syscall.h>
-#include <genarch/acpi/acpi.h>
-#include <genarch/drivers/ega/ega.h>
-#include <genarch/drivers/i8042/i8042.h>
-#include <genarch/drivers/legacy/ia32/io.h>
-#include <genarch/fb/bfb.h>
-#include <genarch/kbrd/kbrd.h>
-#include <genarch/multiboot/multiboot.h>
-#include <genarch/multiboot/multiboot2.h>
-
-#ifdef CONFIG_SMP
-#include <arch/smp/apic.h>
-#endif
+#include <arch/debugger.h>
+#include <syscall/syscall.h>
+#include <console/console.h>
+#include <ddi/irq.h>
+#include <sysinfo/sysinfo.h>
+#include <memstr.h>
 
 /** Disable I/O on non-privileged levels
@@ -92 +101 @@
 /** Perform amd64-specific initialization before main_bsp() is called.
  *
- * @param signature Multiboot signature.
- * @param info      Multiboot information structure.
- *
- */
-void arch_pre_main(uint32_t signature, void *info)
+ * @param signature Should contain the multiboot signature.
+ * @param mi        Pointer to the multiboot information structure.
+ */
+void arch_pre_main(uint32_t signature, const multiboot_info_t *mi)
 {
         /* Parse multiboot information obtained from the bootloader. */
-        multiboot_info_parse(signature, (multiboot_info_t *) info);
-        multiboot2_info_parse(signature, (multiboot2_info_t *) info);
+        multiboot_info_parse(signature, mi);
         
 #ifdef CONFIG_SMP
@@ -146 +153 @@
                 
 #if (defined(CONFIG_FB) || defined(CONFIG_EGA))
-                bool bfb = false;
+                bool vesa = false;
 #endif
                 
 #ifdef CONFIG_FB
-                bfb = bfb_init();
+                vesa = vesa_init();
 #endif
                 
 #ifdef CONFIG_EGA
-                if (!bfb) {
+                if (!vesa) {
                         outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM);
                         if (egadev)
@@ -214 +221 @@
                 }
         }
+        
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("i8042", NULL, true);
+        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
+        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
+        sysinfo_set_item_val("i8042.address.physical", NULL,
+            (uintptr_t) I8042_BASE);
+        sysinfo_set_item_val("i8042.address.kernel", NULL,
+            (uintptr_t) I8042_BASE);
 #endif
         
         if (irqs_info != NULL)
                 sysinfo_set_item_val(irqs_info, NULL, true);
+        
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 }
 
@@ -240 +261 @@
  * we need not to go to CPL0 to read it.
  */
-sysarg_t sys_tls_set(uintptr_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         THREAD->arch.tls = addr;
         write_msr(AMD_MSR_FS, addr);
         
-        return EOK;
+        return 0;
 }