Changeset 17aca1c in mainline for uspace/srv/hid/fb/serial_console.c

Timestamp:

2011-02-04T20:56:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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/fb/serial_console.c (modified) (5 diffs)

uspace/srv/hid/fb/serial_console.c

@@ -39 +39 @@
 
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <ipc/fb.h>
@@ -319 +318 @@
         
         if (client_connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
         
         client_connected = 1;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         /* Clear the terminal, set scrolling region
@@ -348 +347 @@
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         
                         /* Exit thread */
@@ -407 +406 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_2(callid, EOK, scr_width, scr_height);
+                        async_answer_2(callid, EOK, scr_width, scr_height);
                         continue;
                 case FB_GET_COLOR_CAP:
-                        ipc_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :
+                        async_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :
                             FB_CCAP_STYLE);
                         continue;
@@ -478 +477 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }