Changeset 7688b5d in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2006-10-18T09:54:13Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6fb30a1

Parents:

19de05f

Message:

mips32: update for new IRQ subsystem

File:

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

kernel/arch/mips32/src/mips32.c

@@ -55 +55 @@
 #include <genarch/fb/fb.h>
 #include <macros.h>
+#include <ddi/device.h>
 
 #include <arch/asm/regname.h>
@@ -99 +100 @@
 
         /* Copy the exception vectors to the right places */
-        memcpy(TLB_EXC, (char *)tlb_refill_entry, EXCEPTION_JUMP_SIZE);
-        memcpy(NORM_EXC, (char *)exception_entry, EXCEPTION_JUMP_SIZE);
-        memcpy(CACHE_EXC, (char *)cache_error_entry, EXCEPTION_JUMP_SIZE);
-
-        interrupt_init();
+        memcpy(TLB_EXC, (char *) tlb_refill_entry, EXCEPTION_JUMP_SIZE);
+        memcpy(NORM_EXC, (char *) exception_entry, EXCEPTION_JUMP_SIZE);
+        memcpy(CACHE_EXC, (char *) cache_error_entry, EXCEPTION_JUMP_SIZE);
+        
         /*
          * Switch to BEV normal level so that exception vectors point to the kernel.
@@ -114 +114 @@
          */
         cp0_mask_all_int();
-
-        /*
-         * Unmask hardware clock interrupt.
-         */
-        cp0_unmask_int(TIMER_IRQ);
-
-        console_init();
+                
         debugger_init();
 }
@@ -126 +120 @@
 void arch_post_mm_init(void)
 {
+        interrupt_init();
+        console_init(device_assign_devno());
 #ifdef CONFIG_FB
         fb_init(0x12000000, 640, 480, 24, 1920, false); // gxemul framebuffer
 #endif
-        sysinfo_set_item_val("machine." STRING(MACHINE),NULL,1);
+        sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
 }