Changeset bbc28be in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-12-03T12:59:13Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

70c85211

Parents:

2e15ac40 (diff), da55d5b (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:

Merged branch development into /lelian/hidd

File:

• uspace/srv/devman/devman.c (modified) (2 diffs)

uspace/srv/devman/devman.c

@@ -651 +651 @@
         
         /* Send the device to the driver. */
-        aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle,
-            &answer);
+        devman_handle_t parent_handle;
+        if (node->parent) {
+                parent_handle = node->parent->handle;
+        } else {
+                parent_handle = 0;
+        }
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
+            parent_handle, &answer);
         
         /* Send the device's name to the driver. */
@@ -1022 +1028 @@
         
         size_t idx = get_new_class_dev_idx(cl);
-        asprintf(&dev_name, "%s%d", base_name, idx);
+        asprintf(&dev_name, "%s%zu", base_name, idx);
         
         return dev_name;