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

Timestamp:

2015-11-02T20:54:19Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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) (3 diffs)

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

@@ -210 +210 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
+        rc = block_init(indev_sid, 2048);
         if (rc != EOK)  {
                 printf(NAME ": could not init libblock.\n");
@@ -235 +235 @@
 
         /* Register server with location service. */
-        async_set_client_connection(mbr_connection);
+        async_set_fallback_port_handler(mbr_connection, NULL);
         rc = loc_server_register(NAME);
         if (rc != EOK) {
@@ -416 +416 @@
 
         /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
-
-        /* 
+        dh = IPC_GET_ARG2(*icall);
+
+        /*
          * Determine which partition device is the client connecting to.
          * A linear search is not terribly fast, but we only do this