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

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/srv/hid/fb/main.c (moved) (moved from uspace/srv/fb/main.c ) (8 diffs)

uspace/srv/hid/fb/main.c

@@ -27 +27 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <sysinfo.h>
 #include <async.h>
@@ -41 +41 @@
 #include "ski.h"
 #include "sgcn.h"
+#include "niagara.h"
 #include "main.h"
 
@@ -50 +51 @@
         
         dest = as_get_mappable_page(IPC_GET_ARG2(*call));
-        if (ipc_answer_1(callid, EOK, (sysarg_t) dest) == 0) {
+        if (async_answer_1(callid, EOK, (sysarg_t) dest) == 0) {
                 if (*area)
                         as_area_destroy(*area);
@@ -59 +60 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS Framebuffer service\n");
+        printf("%s: HelenOS Framebuffer service\n", NAME);
         
-        ipcarg_t phonead;
         bool initialized = false;
+        sysarg_t fb_present;
+        sysarg_t fb_kind;
+        
+        if (sysinfo_get_value("fb", &fb_present) != EOK)
+                fb_present = false;
+        
+        if (sysinfo_get_value("fb.kind", &fb_kind) != EOK) {
+                printf("%s: Unable to detect framebuffer configuration\n", NAME);
+                return -1;
+        }
         
 #ifdef FB_ENABLED
-        if (sysinfo_value("fb.kind") == 1) {
+        if ((!initialized) && (fb_kind == 1)) {
                 if (fb_init() == 0)
                         initialized = true;
@@ -71 +81 @@
 #endif
 #ifdef EGA_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
+        if ((!initialized) && (fb_kind == 2)) {
                 if (ega_init() == 0)
                         initialized = true;
@@ -77 +87 @@
 #endif
 #ifdef MSIM_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 3)) {
+        if ((!initialized) && (fb_kind == 3)) {
                 if (msim_init() == 0)
                         initialized = true;
@@ -83 +93 @@
 #endif
 #ifdef SGCN_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 4)) {
+        if ((!initialized) && (fb_kind == 4)) {
                 if (sgcn_init() == 0)
                         initialized = true;
         }
 #endif
+#ifdef NIAGARA_ENABLED
+        if ((!initialized) && (fb_kind == 5)) {
+                if (niagara_init() == 0)
+                        initialized = true;
+        }
+#endif
 #ifdef SKI_ENABLED
-        if ((!initialized) && (sysinfo_value("fb") != true)) {
+        if ((!initialized) && (fb_kind == 6)) {
                 if (ski_init() == 0)
                         initialized = true;
@@ -98 +114 @@
                 return -1;
         
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
+        if (service_register(SERVICE_VIDEO) != EOK)
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         async_manager();