Changeset 46b881c in mainline for uspace/lib/block/libblock.c

Timestamp:

2011-01-29T11:36:41Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b6931a, 8add9ca5

Parents:

e26a4633 (diff), ffa2c8ef (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:

IPC/async: strictly isolate the use of low-level IPC methods (ipc_*) and async framework methods (async_*) in user code, do not allow a mixture of both in a single source file

Benefits for future plans

• The async framework could use different communication style under the hood, but keeping the same high-level API
• The async framework can be integrated more tightly with sessions without potential problems of intermixing session-aware async methods with session-unaware low-level methods in user code
• The async_serialize_start()/_end() can be deprecated more easily

File:

• uspace/lib/block/libblock.c (modified) (5 diffs)

uspace/lib/block/libblock.c

@@ -44 +44 @@
 #include <sys/mman.h>
 #include <async.h>
-#include <ipc/ipc.h>
 #include <as.h>
 #include <assert.h>
@@ -177 +176 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -183 +182 @@
         if (get_block_size(dev_phone, &bsize) != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -190 +189 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -211 +210 @@
 
         munmap(devcon->comm_area, devcon->comm_size);
-        ipc_hangup(devcon->dev_phone);
+        async_hangup(devcon->dev_phone);
 
         free(devcon);