Changeset 7c014d1 in mainline for uspace/app/init/init.c

Timestamp:

2011-09-09T15:46:21Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c69646f8

Parents:

14a60e3

Message:

console and framebuffer server rewrite

File:

• uspace/app/init/init.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -196 +196 @@
 }
 
-static void console(const char *svc)
-{
-        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, svc);
+static void console(const char *isvc, const char *fbsvc)
+{
+        printf("%s: Spawning %s %s %s\n", NAME, SRV_CONSOLE, isvc, fbsvc);
         
         /* Wait for the input service to be ready */
         service_id_t service_id;
-        int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, svc,
-                    str_error(rc));
-                return;
-        }
-        
-        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, svc, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
-                    svc, str_error(rc));
+        int rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
+                    str_error(rc));
+                return;
+        }
+        
+        /* Wait for the framebuffer service to be ready */
+        rc = loc_service_get_id(fbsvc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, fbsvc,
+                    str_error(rc));
+                return;
+        }
+        
+        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, isvc, fbsvc, NULL);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s %s %s (%s)\n", NAME, SRV_CONSOLE,
+                    isvc, fbsvc, str_error(rc));
         }
 }
@@ -300 +308 @@
         spawn("/srv/fb");
         spawn("/srv/input");
-        console("hid/input");
+        console("hid/input", "hid/fb0");
         
         spawn("/srv/clip");