Changeset 6da1013f in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2009-02-12T20:09:19Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

84266669

Parents:

7004747

Message:

simplify configuration
introduce arch_construct_function and inb/outb (sometimes empty) on all platforms
various code cleanup

File:

• kernel/arch/mips32/src/mips32.c (modified) (4 diffs)

kernel/arch/mips32/src/mips32.c

@@ -112 +112 @@
         cp0_status_write(cp0_status_read() &
             ~(cp0_status_bev_bootstrap_bit | cp0_status_erl_error_bit));
-
-        /* 
-         * Mask all interrupts 
+        
+        /*
+         * Mask all interrupts
          */
         cp0_mask_all_int();
-                
+        
         debugger_init();
 }
@@ -133 +133 @@
                 .y = 480,
                 .scan = 1920,
-                .visual = VISUAL_RGB_8_8_8,
+                .visual = VISUAL_BGR_8_8_8,
         };
         fb_init(&gxemul_prop);
 #endif
-        sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
+
+#ifdef msim
+        sysinfo_set_item_val("machine.msim", NULL, 1);
+#endif
+
+#ifdef simics
+        sysinfo_set_item_val("machine.simics", NULL, 1);
+#endif
+
+#ifdef bgxemul
+        sysinfo_set_item_val("machine.bgxemul", NULL, 1);
+#endif
+
+#ifdef lgxemul
+        sysinfo_set_item_val("machine.lgxemul", NULL, 1);
+#endif
 }
 
@@ -162 +177 @@
             (uintptr_t) kernel_uarg->uspace_entry);
         
-        while (1)
-                ;
+        while (1);
 }
 
@@ -196 +210 @@
         ___halt();
         
-        while (1)
-                ;
+        while (1);
+}
+
+/** 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;
 }