Changeset ff381a7 in mainline for uspace/srv/bd

Timestamp:

2015-11-02T20:54:19Z (10 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.

Location:

uspace/srv/bd

Files:

• file_bd/file_bd.c (modified) (1 diff)
• part/guid_part/guid_part.c (modified) (3 diffs)
• part/mbr_part/mbr_part.c (modified) (3 diffs)
• rd/rd.c (modified) (1 diff)
• sata_bd/sata_bd.c (modified) (2 diffs)
• vbd/disk.c (modified) (3 diffs)
• vbd/vbd.c (modified) (2 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -157 +157 @@
         bd_srvs.ops = &file_bd_ops;
         
-        async_set_client_connection(file_bd_connection);
+        async_set_fallback_port_handler(file_bd_connection, NULL);
         int rc = loc_server_register(NAME);
         if (rc != EOK) {

uspace/srv/bd/part/guid_part/guid_part.c

@@ -160 +160 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
+        rc = block_init(indev_sid, 2048);
         if (rc != EOK)  {
                 printf(NAME ": could not init libblock.\n");
@@ -185 +185 @@
 
         /* Register server with location service. */
-        async_set_client_connection(gpt_connection);
+        async_set_fallback_port_handler(gpt_connection, NULL);
         rc = loc_server_register(NAME);
         if (rc != EOK) {
@@ -339 +339 @@
 
         /* 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

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

uspace/srv/bd/rd/rd.c

@@ -178 +178 @@
         bd_srvs.ops = &rd_bd_ops;
         
-        async_set_client_connection(rd_client_conn);
+        async_set_fallback_port_handler(rd_client_conn, NULL);
         ret = loc_server_register(NAME);
         if (ret != EOK) {

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) {

uspace/srv/bd/vbd/disk.c

@@ -360 +360 @@
         rc = vbds_disk_by_svcid(sid, &disk);
         if (rc == EOK)
-                return EEXISTS;
+                return EEXIST;
 
         disk = calloc(1, sizeof(vbds_disk_t));
@@ -374 +374 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_init(%zu)", sid);
-        rc = block_init(EXCHANGE_SERIALIZE, sid, 2048);
+        rc = block_init(sid, 2048);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening block device %s.",
@@ -872 +872 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_conn()");
 
-        svcid = IPC_GET_ARG1(*icall);
+        svcid = IPC_GET_ARG2(*icall);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_conn() - svcid=%zu", svcid);

uspace/srv/bd/vbd/vbd.c

@@ -64 +64 @@
                 return rc;
 
-        async_set_client_connection(vbds_client_conn);
+        async_set_fallback_port_handler(vbds_client_conn, NULL);
 
         rc = loc_server_register(NAME);
@@ -415 +415 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_client_conn()");
 
-        sid = (service_id_t)IPC_GET_ARG1(*icall);
+        sid = (service_id_t)IPC_GET_ARG2(*icall);
 
         if (sid == ctl_sid)