Changes in uspace/srv/hid/fb/main.c [3193c05:b3d513f] in mainline

File:

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

uspace/srv/hid/fb/main.c

@@ -41 +41 @@
 #include "ski.h"
 #include "sgcn.h"
-#include "niagara.h"
 #include "main.h"
 
@@ -60 +59 @@
 int main(int argc, char *argv[])
 {
-        printf("%s: HelenOS Framebuffer service\n", NAME);
+        printf(NAME ": HelenOS Framebuffer service\n");
         
+        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 ((!initialized) && (fb_kind == 1)) {
+        if (sysinfo_value("fb.kind") == 1) {
                 if (fb_init() == 0)
                         initialized = true;
@@ -81 +71 @@
 #endif
 #ifdef EGA_ENABLED
-        if ((!initialized) && (fb_kind == 2)) {
+        if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
                 if (ega_init() == 0)
                         initialized = true;
@@ -87 +77 @@
 #endif
 #ifdef MSIM_ENABLED
-        if ((!initialized) && (fb_kind == 3)) {
+        if ((!initialized) && (sysinfo_value("fb.kind") == 3)) {
                 if (msim_init() == 0)
                         initialized = true;
@@ -93 +83 @@
 #endif
 #ifdef SGCN_ENABLED
-        if ((!initialized) && (fb_kind == 4)) {
+        if ((!initialized) && (sysinfo_value("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) && (fb_kind == 6)) {
+        if ((!initialized) && (sysinfo_value("fb") != true)) {
                 if (ski_init() == 0)
                         initialized = true;
@@ -114 +98 @@
                 return -1;
         
-        ipcarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
                 return -1;
         
-        printf("%s: Accepting connections\n", NAME);
+        printf(NAME ": Accepting connections\n");
         async_manager();