Changeset 4904de8 in mainline

Timestamp:

2009-03-02T17:32:40Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

430afff

Parents:

8026731

Message:

blocking connection to keyboard and video services

File:

• uspace/srv/console/console.c (modified) (1 diff)

uspace/srv/console/console.c

@@ -510 +510 @@
         
         /* Connect to keyboard driver */
-        kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-        while (kbd_phone < 0) {
-                usleep(10000);
-                kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-        }
-        
-        if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
+        kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+        if (kbd_phone < 0) {
+                printf(NAME ": Failed to connect to keyboard service\n");
                 return -1;
+        }
+        
+        if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+                printf(NAME ": Failed to create callback from keyboard service\n");
+                return -1;
+        }
+        
         async_new_connection(phonehash, 0, NULL, keyboard_events);
         
         /* Connect to framebuffer driver */
-        fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
-        while (fb_info.phone < 0) {
-                usleep(10000);
-                fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
+        fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
+        if (fb_info.phone < 0) {
+                printf(NAME ": Failed to connect to video service\n");
+                return -1;
         }