Changeset ff381a7 in mainline for uspace/srv/bd/sata_bd/sata_bd.c

Timestamp:

2015-11-02T20:54:19Z (8 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/sata_bd/sata_bd.c (modified) (2 diffs)

uspace/srv/bd/sata_bd/sata_bd.c

@@ -172 +172 @@
 
         /* Get the device service ID. */
-        dsid = IPC_GET_ARG1(*icall);
+        dsid = IPC_GET_ARG2(*icall);
 
         /* Determine which disk device is the client connecting to. */
@@ -247 +247 @@
         int rc;
         
-        async_set_client_connection(sata_bd_connection);
+        async_set_fallback_port_handler(sata_bd_connection, NULL);
         rc = loc_server_register(NAME);
         if (rc < 0) {