Changes in kernel/arch/ia32/src/ia32.c [f902d36:a71c158] in mainline

File:

• kernel/arch/ia32/src/ia32.c (modified) (8 diffs)

kernel/arch/ia32/src/ia32.c

@@ -37 +37 @@
 #include <arch.h>
 
-#include <typedefs.h>
+#include <arch/types.h>
 
 #include <arch/pm.h>
@@ -68 +68 @@
 #include <sysinfo/sysinfo.h>
 #include <arch/boot/boot.h>
-#include <memstr.h>
 
 #ifdef CONFIG_SMP
@@ -139 +138 @@
 {
 #ifdef CONFIG_SMP
-        if (config.cpu_active > 1) {
+        if (config.cpu_active > 1) {
                 l_apic_init();
                 l_apic_debug();
@@ -157 +156 @@
 void arch_post_smp_init(void)
 {
-        /* Currently the only supported platform for ia32 is 'pc'. */
-        static const char *platform = "pc";
-
-        sysinfo_set_item_data("platform", NULL, (void *) platform,
-            str_size(platform));
-
 #ifdef CONFIG_PC_KBD
         /*
@@ -176 +169 @@
                         i8042_wire(i8042_instance, kbrd);
                         trap_virtual_enable_irqs(1 << IRQ_KBD);
-                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -184 +176 @@
          * 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,
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
             (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("i8042.address.kernel", NULL,
+        sysinfo_set_item_val("kbd.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);
 }
 
@@ -216 +202 @@
  * selector, and the descriptor->base is the correct address.
  */
-sysarg_t sys_tls_set(sysarg_t addr)
+unative_t sys_tls_set(unative_t addr)
 {
         THREAD->arch.tls = addr;
@@ -245 +231 @@
 }
 
-void irq_initialize_arch(irq_t *irq)
-{
-        (void) irq;
-}
-
 /** @}
  */