Changeset 4f5dc18 in mainline for uspace/srv/devmap/devmap.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/devmap/devmap.c (modified) (9 diffs)

uspace/srv/devmap/devmap.c

@@ -213 +213 @@
         ipc_callid_t callid;
         size_t name_size;
-        if (!ipc_data_write_receive(&callid, &name_size)) {
+        if (!async_data_write_receive(&callid, &name_size)) {
                 free(driver);
                 ipc_answer_0(callid, EREFUSED);
@@ -241 +241 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (ipc_data_write_finalize(callid, driver->name, name_size) != EOK) {
+        if (async_data_write_finalize(callid, driver->name, name_size) != EOK) {
                 free(driver->name);
                 free(driver);
@@ -358 +358 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 free(device);
                 ipc_answer_0(iid, EREFUSED);
@@ -381 +381 @@
         }
         
-        ipc_data_write_finalize(callid, device->name, size);
+        async_data_write_finalize(callid, device->name, size);
         device->name[size] = 0;
         
@@ -466 +466 @@
         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, EREFUSED);
                 ipc_answer_0(iid, EREFUSED);
@@ -491 +491 @@
          * Send confirmation to sender and get data into buffer.
          */
-        ipcarg_t retval = ipc_data_write_finalize(callid, name, size);
+        ipcarg_t retval = async_data_write_finalize(callid, name, size);
         if (retval != EOK) {
                 ipc_answer_0(iid, EREFUSED);
@@ -553 +553 @@
          * size_t name_size = str_size(device->name);
          *
-         * int rc = ipc_data_write_send(phone, device->name, name_size);
+         * int rc = async_data_write_send(phone, device->name, name_size);
          * if (rc != EOK) {
          *     async_wait_for(req, NULL);
@@ -576 +576 @@
         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, EREFUSED);
                 ipc_answer_0(iid, EREFUSED);
@@ -608 +608 @@
         }
         
-        ipcarg_t retval = ipc_data_read_finalize(callid, desc, pos * sizeof(dev_desc_t));
+        ipcarg_t retval = async_data_read_finalize(callid, desc, pos * sizeof(dev_desc_t));
         if (retval != EOK) {
                 ipc_answer_0(iid, EREFUSED);