Changeset 965dc18 in mainline for uspace/srv/fb/main.c

Timestamp:

2008-12-05T19:59:03Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• uspace/srv/fb/main.c (modified) (2 diffs)

uspace/srv/fb/main.c

@@ -39 +39 @@
 #include "ega.h"
 #include "msim.h"
+#include "sgcn.h"
 #include "main.h"
 
@@ -80 +81 @@
         }
 #endif
+#ifdef SGCN_ENABLED
+        if ((!initialized) && (sysinfo_value("fb.kind") == 4)) {
+                if (sgcn_init() == 0)
+                        initialized = true;
+        }
+#endif
 
         if (!initialized)