Changeset bfd7aac in mainline for uspace/srv/hid/fb/main.c

Timestamp:

2010-02-17T19:19:08Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/hid/fb/main.c

@@ -41 +41 @@
 #include "ski.h"
 #include "sgcn.h"
+#include "niagara.h"
 #include "main.h"
 
@@ -88 +89 @@
         }
 #endif
+#ifdef NIAGARA_ENABLED
+        if ((!initialized) && (sysinfo_value("fb.kind") == 5)) {
+                if (niagara_init() == 0)
+                        initialized = true;
+        }
+#endif
 #ifdef SKI_ENABLED
         if ((!initialized) && (sysinfo_value("fb") != true)) {