Changeset 0d6915f in mainline

Timestamp:

2010-11-26T13:57:51Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0ca16307, b12d3cc

Parents:

cc70d57

Message:

device_t has parent set when in the same driver

Location:

uspace

Files:

• lib/drv/generic/driver.c (modified) (2 diffs)
• srv/devman/devman.c (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -164 +164 @@
         
         devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
+    
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -171 +173 @@
         
         add_to_devices_list(dev);
+        dev->parent = driver_get_device(&devices, parent_dev_handle);
+        
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {

uspace/srv/devman/devman.c

@@ -643 +643 @@
         
         /* 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. */