Changeset df747b9c in mainline for uspace/srv/devman

Timestamp:

2010-04-23T11:30:25Z (16 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

Location:

uspace/srv/devman

Files:

• devman.c (modified) (1 diff)
• devman.h (modified) (2 diffs)
• main.c (modified) (2 diffs)

uspace/srv/devman/devman.c

@@ -519 +519 @@
         async_wait_for(req, &rc);
         switch(rc) {
-                // TODO inspect return value to find out whether the device was successfully probed and added
         case EOK:
+                node->state = DEVICE_USABLE;
+                break;
         case ENOENT:
-                
+                node->state = DEVICE_NOT_PRESENT;
                 break;
-                
+        default:
+                node->state = DEVICE_INVALID;           
         }
         

uspace/srv/devman/devman.h

@@ -93 +93 @@
 } driver_list_t;
 
+/** The state of the device. */
+typedef enum {
+        DEVICE_NOT_INITIALIZED = 0,
+        DEVICE_USABLE,
+        DEVICE_NOT_PRESENT,
+        DEVICE_INVALID
+} device_state_t;
+
 /** Representation of a node in the device tree.*/
 struct node {
@@ -113 +121 @@
         /** Driver of this device.*/
         driver_t *drv;
+        /** The state of the device. */
+        device_state_t state;
         /** Pointer to the previous and next device in the list of devices
             owned by one driver */

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);      
 }