Index: kernel/arch/mips32/include/console.h
===================================================================
--- kernel/arch/mips32/include/console.h	(revision 29b2bbf5311052c0b1ad8971cfac6843f0ef6a1b)
+++ kernel/arch/mips32/include/console.h	(revision a000fd71083ee6c3d075fc87d57f7801ca6dd58b)
@@ -36,5 +36,5 @@
 #define KERN_mips32_CONSOLE_H_
 
-void console_init(void);
+extern void console_init(devno_t devno);
 
 #endif
Index: kernel/arch/mips32/include/drivers/msim.h
===================================================================
--- kernel/arch/mips32/include/drivers/msim.h	(revision 29b2bbf5311052c0b1ad8971cfac6843f0ef6a1b)
+++ kernel/arch/mips32/include/drivers/msim.h	(revision a000fd71083ee6c3d075fc87d57f7801ca6dd58b)
@@ -38,10 +38,5 @@
 #include <console/chardev.h>
 
-#define MSIM_VIDEORAM            	0xB0000000
-/** Address of 'keyboard' device. */
-#define MSIM_KBD_ADDRESS		0xB0000000
-#define MSIM_KBD_IRQ	2
-
-void msim_console(void);
+void msim_console(devno_t devno);
 void msim_kbd_release(void);
 void msim_kbd_grab(void);
Index: kernel/arch/mips32/include/drivers/serial.h
===================================================================
--- kernel/arch/mips32/include/drivers/serial.h	(revision 29b2bbf5311052c0b1ad8971cfac6843f0ef6a1b)
+++ kernel/arch/mips32/include/drivers/serial.h	(revision a000fd71083ee6c3d075fc87d57f7801ca6dd58b)
@@ -63,6 +63,6 @@
 }serial_t;
 
-void serial_console(void);
-int serial_init(void);
+extern void serial_console(devno_t devno);
+extern int serial_init(void);
 
 #endif
Index: kernel/arch/mips32/include/interrupt.h
===================================================================
--- kernel/arch/mips32/include/interrupt.h	(revision 29b2bbf5311052c0b1ad8971cfac6843f0ef6a1b)
+++ kernel/arch/mips32/include/interrupt.h	(revision a000fd71083ee6c3d075fc87d57f7801ca6dd58b)
@@ -38,15 +38,8 @@
 #include <arch/exception.h>
 
-#define IVT_ITEMS   40
-#define INT_OFFSET  32
-#define IRQ_COUNT   8
+#define IVT_ITEMS 32
+#define IVT_FIRST 0
 
-#define int_register(it, name, handler) exc_register(((it)+INT_OFFSET),name,handler)
-
-#define IRQ2	2
-#define IRQ3	3
-#define IRQ7	7
-
-#define TIMER_IRQ   	IRQ7
+extern function timer_fnc;
 
 extern void interrupt_init(void);