Changeset df747b9c in mainline for uspace/srv/devman/main.c

Timestamp:

2010-04-23T11:30:25Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5af21c5

Parents:

a78fa2a

Message:

added device states (usable, invalid, not present, not initialized); add_device driver callback method returns integer (errno) instead of bool

File:

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

uspace/srv/devman/main.c

@@ -309 +309 @@
                         driver = dev->parent->drv;              
                 }
-        } else {
+        } else if (DEVICE_USABLE == dev->state) {
                 driver = dev->drv;              
+                assert(NULL != driver);
         }
         
         if (NULL == driver) {   
-                printf(NAME ": devman_forward error - no driver to connect to.\n", handle);
+                printf(NAME ": devman_forward error - the device is not in usable state.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return; 
@@ -331 +332 @@
                 return;
         }
-        printf(NAME ": devman_forward: forward connection to device %s to driver %s with phone %d.\n", 
-                dev->pathname, driver->name, driver->phone);
+        printf(NAME ": devman_forward: forward connection to device %s to driver %s.\n", dev->pathname, driver->name);
         ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);      
 }