Changeset 113c677 in mainline for uspace

Timestamp:

2008-07-27T15:15:48Z (17 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

Location:

uspace/srv/fb

Files:

• Makefile (modified) (2 diffs)
• main.c (modified) (2 diffs)
• msim.c (added)
• msim.h (added)

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