Changeset 1515522 in mainline for kernel/arch/mips32/src

Timestamp:

2009-03-07T20:21:15Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c6b3a2

Parents:

901cda3

Message:

Nuke the mips32-specific ns16550 driver.
Remove the conflicting console_init() too.

Location:

kernel/arch/mips32/src

Files:

• console.c (modified) (1 diff)
• drivers/serial.c (deleted)
• mips32.c (modified) (2 diffs)

kernel/arch/mips32/src/console.c

@@ -39 +39 @@
 #include <genarch/fb/fb.h>
 
-void console_init(devno_t devno)
-{
-        if (serial_init())
-                serial_console(devno);
-        else
-                msim_console(devno);
-}
-
 /** Acquire console back for kernel
  *

kernel/arch/mips32/src/mips32.c

@@ -57 +57 @@
 #include <config.h>
 #include <string.h>
+#include <arch/drivers/msim.h>
 
 #include <arch/asm/regname.h>
@@ -133 +134 @@
 {
         interrupt_init();
-        console_init(device_assign_devno());
+        msim_console(device_assign_devno());
 #ifdef CONFIG_FB
         /* GXemul framebuffer */