Changeset 4f5dc18 in mainline for uspace/srv/console/console.c

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

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

uspace/srv/console/console.c

@@ -40 +40 @@
 #include <ipc/services.h>
 #include <errno.h>
-#include <keybuffer.h>
 #include <ipc/console.h>
 #include <unistd.h>
@@ -55 +54 @@
 #include "console.h"
 #include "gcons.h"
+#include "keybuffer.h"
 #include "screenbuffer.h"
 
@@ -429 +429 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -442 +442 @@
         }
         
-        (void) ipc_data_write_finalize(callid, buf, size);
+        (void) async_data_write_finalize(callid, buf, size);
         
         async_serialize_start();
@@ -464 +464 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_read_receive(&callid, &size)) {
+        if (!async_data_read_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -489 +489 @@
         
         if (pos == size) {
-                (void) ipc_data_read_finalize(callid, buf, size);
+                (void) async_data_read_finalize(callid, buf, size);
                 ipc_answer_1(rid, EOK, size);
                 free(buf);
@@ -713 +713 @@
         
         if (interbuffer) {
-                if (ipc_share_out_start(fb_info.phone, interbuffer,
+                if (async_share_out_start(fb_info.phone, interbuffer,
                     AS_AREA_READ) != EOK) {
                         as_area_destroy(interbuffer);