Changeset 9a66bc2 in mainline for uspace/srv/devman/main.c

Timestamp:

2010-04-04T21:52:26Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

8c06905

Parents:

5cd136ab

Message:

several bugs fixed

File:

• uspace/srv/devman/main.c (modified) (3 diffs)

uspace/srv/devman/main.c

@@ -258 +258 @@
 }
 
-static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, bool drv_to_parent) {
-        device_handle_t handle;
+static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, bool drv_to_parent) {   
+        
+        device_handle_t handle = IPC_GET_ARG2(*icall);
+        printf(NAME ": devman_forward - trying to forward connection to device with handle %x.\n", handle);
+        
         node_t *dev = find_dev_node(&device_tree, handle);
         if (NULL == dev) {
+                printf(NAME ": devman_forward error - no device with handle %x was found.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -269 +273 @@
         
         if (drv_to_parent) {
-                driver = dev->parent->drv;
+                if (NULL != dev->parent) {
+                        driver = dev->parent->drv;              
+                }
         } else {
                 driver = dev->drv;              
         }
         
-        if (NULL == driver) {           
+        if (NULL == driver) {   
+                printf(NAME ": devman_forward error - no driver to connect to.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return; 
@@ -286 +293 @@
         }
         
+        if (driver->phone <= 0) {
+                printf(NAME ": devman_forward: cound not forward to driver %s (the driver's phone is %x).\n", driver->name, driver->phone);
+                return;
+        }
+        printf(NAME ": devman_forward: forward to driver %s with phone %d.\n", driver->name, driver->phone);
         ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);      
 }