Changeset 1affcdf3 in mainline for uspace/srv/bd/part/mbr_part/mbr_part.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/bd/part/mbr_part/mbr_part.c (modified) (2 diffs)

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -190 +190 @@
         }
 
-        rc = block_init(indev_handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048);
         if (rc != EOK)  {
                 printf(NAME ": could not init libblock.\n");
@@ -437 +437 @@
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
-                switch (method) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!method) {
                         /* The other side has hung up. */
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (method) {
                 case BD_READ_BLOCKS:
                         ba = MERGE_LOUP32(IPC_GET_ARG1(call),