Changeset ad7a6c9 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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

File:

• uspace/srv/hid/console/console.c (modified) (21 diffs)

uspace/srv/hid/console/console.c

@@ -34 +34 @@
 
 #include <libc.h>
-#include <ipc/ipc.h>
 #include <ipc/kbd.h>
 #include <io/keycode.h>
@@ -40 +39 @@
 #include <ipc/fb.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <errno.h>
 #include <ipc/console.h>
@@ -116 +116 @@
 static void curs_hide_sync(void)
 {
-        ipc_call_sync_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false); 
+        async_req_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false); 
 }
 
@@ -131 +131 @@
 static void screen_yield(void)
 {
-        ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_YIELD);
+        async_req_0_0(fb_info.phone, FB_SCREEN_YIELD);
 }
 
 static void screen_reclaim(void)
 {
-        ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_RECLAIM);
+        async_req_0_0(fb_info.phone, FB_SCREEN_RECLAIM);
 }
 
 static void kbd_yield(void)
 {
-        ipc_call_sync_0_0(kbd_phone, KBD_YIELD);
+        async_req_0_0(kbd_phone, KBD_YIELD);
 }
 
 static void kbd_reclaim(void)
 {
-        ipc_call_sync_0_0(kbd_phone, KBD_RECLAIM);
+        async_req_0_0(kbd_phone, KBD_RECLAIM);
 }
 
@@ -437 +437 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -472 +472 @@
                 }
 
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -483 +483 @@
         
         if (rc != EOK) {
-                ipc_answer_0(rid, rc);
+                async_answer_0(rid, rc);
                 return;
         }
@@ -498 +498 @@
         
         gcons_notify_char(cons->index);
-        ipc_answer_1(rid, EOK, size);
+        async_answer_1(rid, EOK, size);
         
         free(buf);
@@ -508 +508 @@
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -515 +515 @@
         char *buf = (char *) malloc(size);
         if (buf == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
                 return;
         }
@@ -534 +534 @@
         if (pos == size) {
                 (void) async_data_read_finalize(callid, buf, size);
-                ipc_answer_1(rid, EOK, size);
+                async_answer_1(rid, EOK, size);
                 free(buf);
         } else {
@@ -552 +552 @@
 recheck:
         if (keybuffer_pop(&cons->keybuffer, &ev)) {
-                ipc_answer_4(rid, EOK, ev.type, ev.key, ev.mods, ev.c);
+                async_answer_4(rid, EOK, ev.type, ev.key, ev.mods, ev.c);
         } else {
                 fibril_condvar_wait(&input_cv, &input_mutex);
@@ -578 +578 @@
         
         if (cons == NULL) {
-                ipc_answer_0(iid, ENOENT);
+                async_answer_0(iid, ENOENT);
                 return;
         }
@@ -597 +597 @@
         
         /* Accept the connection */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -657 +657 @@
                         rc = ccap_fb_to_con(fb_info.color_cap, &arg1);
                         if (rc != EOK) {
-                                ipc_answer_0(callid, rc);
+                                async_answer_0(callid, rc);
                                 continue;
                         }
@@ -701 +701 @@
                         break;
                 }
-                ipc_answer_3(callid, EOK, arg1, arg2, arg3);
+                async_answer_3(callid, EOK, arg1, arg2, arg3);
         }
 }
@@ -726 +726 @@
         
         /* NB: The callback connection is slotted for removal */
-        sysarg_t phonehash;
-        if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+        if (async_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, keyboard_events)
+            != 0) {
                 printf(NAME ": Failed to create callback from input device\n");
                 return false;
         }
-        
-        async_new_connection(phonehash, 0, NULL, keyboard_events);
         
         /* Connect to mouse device */
@@ -749 +747 @@
         }
         
-        if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+        if (async_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, mouse_events)
+            != 0) {
                 printf(NAME ": Failed to create callback from mouse device\n");
                 mouse_phone = -1;
@@ -755 +754 @@
         }
         
-        async_new_connection(phonehash, 0, NULL, mouse_events);
 skip_mouse:
         
         /* Connect to framebuffer driver */
-        fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
+        fb_info.phone = service_connect_blocking(SERVICE_VIDEO, 0, 0);
         if (fb_info.phone < 0) {
                 printf(NAME ": Failed to connect to video service\n");
@@ -816 +814 @@
                         
                         if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {
-                                devmap_hangup_phone(DEVMAP_DRIVER);
                                 printf(NAME ": Unable to register device %s\n", vc);
                                 return false;
@@ -836 +833 @@
         
         /* Receive kernel notifications */
+        async_set_interrupt_received(interrupt_received);
         if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
                 printf(NAME ": Error registering kconsole notifications\n");
-        
-        async_set_interrupt_received(interrupt_received);
         
         return true;