Changeset 4a68194 in mainline

Timestamp:

2009-06-04T18:06:29Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

abc4982

Parents:

3bf907a

Message:

no not disturb console initialization by connections

File:

• uspace/srv/console/console.c (modified) (7 diffs)

uspace/srv/console/console.c

@@ -712 +712 @@
 static bool console_init(void)
 {
+        async_serialize_start();
+        
         /* Connect to keyboard driver */
-        
         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");
+                async_serialize_end();
                 return false;
         }
@@ -723 +725 @@
         if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from keyboard service\n");
+                async_serialize_end();
                 return false;
         }
@@ -733 +736 @@
         if (fb_info.phone < 0) {
                 printf(NAME ": Failed to connect to video service\n");
+                async_serialize_end();
                 return -1;
         }
@@ -740 +744 @@
         if (rc < 0) {
                 printf(NAME ": Unable to register driver (%d)\n", rc);
+                async_serialize_end();
                 return false;
         }
@@ -775 +780 @@
                             fb_info.cols, fb_info.rows) == NULL) {
                                 printf(NAME ": Unable to allocate screen buffer %u\n", i);
+                                async_serialize_end();
                                 return false;
                         }
@@ -788 +794 @@
                                 devmap_hangup_phone(DEVMAP_DRIVER);
                                 printf(NAME ": Unable to register device %s\n", vc);
+                                async_serialize_end();
                                 return false;
                         }
@@ -809 +816 @@
         async_set_interrupt_received(interrupt_received);
         
+        async_serialize_end();
         return true;
 }