Changeset 113c677 in mainline

Timestamp:

2008-07-27T15:15:48Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

94fa807d

Parents:

46d8eb9

Message:

reintroduce support for MSIM text console in user space

Files:

• kernel/arch/ia32/src/drivers/ega.c (modified) (1 diff)
• kernel/arch/mips32/include/drivers/msim.h (modified) (1 diff)
• kernel/arch/mips32/include/drivers/serial.h (modified) (1 diff)
• kernel/arch/mips32/src/drivers/msim.c (modified) (2 diffs)
• uspace/srv/fb/Makefile (modified) (2 diffs)
• uspace/srv/fb/main.c (modified) (2 diffs)
• uspace/srv/fb/msim.c (added)
• uspace/srv/fb/msim.h (added)

kernel/arch/ia32/src/drivers/ega.c

@@ -94 +94 @@
         sysinfo_set_item_val("fb.height", NULL, ROWS);
         sysinfo_set_item_val("fb.address.physical", NULL, VIDEORAM);
-        sysinfo_set_item_val("fb.address.color", NULL, PAGE_COLOR((uintptr_t)
-                videoram));
 }
 

kernel/arch/mips32/include/drivers/msim.h

@@ -37 +37 @@
 
 /** Address of devices. */
-#define MSIM_VIDEORAM           0xB0000000
-#define MSIM_KBD_ADDRESS        0xB0000000
+#define MSIM_VIDEORAM           0x90000000
+#define MSIM_KBD_ADDRESS        0x90000000
 #define MSIM_KBD_IRQ            2
 

kernel/arch/mips32/include/drivers/serial.h

@@ -38 +38 @@
 #include <console/chardev.h>
 
-#define SERIAL_ADDRESS    0xB8000000
+#define SERIAL_ADDRESS    0x98000000
 
 #define SERIAL_MAX        4

kernel/arch/mips32/src/drivers/msim.c

@@ -40 +40 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
+#include <ddi/ddi.h>
 
+static parea_t msim_parea;
 static chardev_t console;
 static irq_t msim_irq;
@@ -154 +156 @@
         sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
         sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
+        
+        msim_parea.pbase = KA2PA(MSIM_VIDEORAM);
+        msim_parea.vbase = MSIM_VIDEORAM;
+        msim_parea.frames = 1;
+        msim_parea.cacheable = false;
+        ddi_parea_register(&msim_parea);
+        
+        sysinfo_set_item_val("fb", NULL, true);
+        sysinfo_set_item_val("fb.kind", NULL, 3);
+        sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM));
 }
 

uspace/srv/fb/Makefile

@@ -51 +51 @@
         CFLAGS += -DFB_ENABLED
 endif
-
 ifeq ($(ARCH), ia32)
         SOURCES += ega.c
@@ -61 +60 @@
 endif
 ifeq ($(ARCH), mips32)
-        CFLAGS += -DFB_INVERT_ENDIAN
+        SOURCES += msim.c
+        CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN
 endif
 

uspace/srv/fb/main.c

@@ -38 +38 @@
 #include "fb.h"
 #include "ega.h"
+#include "msim.h"
 #include "main.h"
 
@@ -59 +60 @@
         
         ipcarg_t phonead;
-        int initialized = 0;
+        bool initialized = false;
 
 #ifdef FB_ENABLED
         if (sysinfo_value("fb.kind") == 1) {
                 if (fb_init() == 0)
-                        initialized = 1;
+                        initialized = true;
         } 
 #endif
 #ifdef EGA_ENABLED
-        if (!initialized && sysinfo_value("fb.kind") == 2) {
+        if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
                 if (ega_init() == 0)
-                        initialized = 1;
+                        initialized = true;
+        }
+#endif
+#ifdef MSIM_ENABLED
+        if ((!initialized) && (sysinfo_value("fb.kind") == 3)) {
+                if (msim_init() == 0)
+                        initialized = true;
         }
 #endif