Changeset 19f24fd in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (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/devmap/devmap.c (modified) (4 diffs)

uspace/srv/devmap/devmap.c

@@ -396 +396 @@
          * Get driver name
          */
-        int rc = async_data_string_receive(&driver->name, DEVMAP_NAME_MAXLEN);
+        int rc = async_data_write_accept((void **) &driver->name, true, 0,
+            DEVMAP_NAME_MAXLEN, 0, NULL);
         if (rc != EOK) {
                 free(driver);
@@ -510 +511 @@
         /* Get fqdn */
         char *fqdn;
-        int rc = async_data_string_receive(&fqdn, DEVMAP_NAME_MAXLEN);
+        int rc = async_data_write_accept((void **) &fqdn, true, 0,
+            DEVMAP_NAME_MAXLEN, 0, NULL);
         if (rc != EOK) {
                 free(device);
@@ -622 +624 @@
         
         /* Get fqdn */
-        int rc = async_data_string_receive(&fqdn, DEVMAP_NAME_MAXLEN);
+        int rc = async_data_write_accept((void **) &fqdn, true, 0,
+            DEVMAP_NAME_MAXLEN, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(iid, rc);
@@ -683 +686 @@
         
         /* Get device name */
-        int rc = async_data_string_receive(&name, DEVMAP_NAME_MAXLEN);
+        int rc = async_data_write_accept((void **) &name, true, 0,
+            DEVMAP_NAME_MAXLEN, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(iid, rc);