Changeset 084ff99 in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-03-14T09:14:50Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

7707954

Parents:

67ba309

Message:

passing device to driver (parts of code)

File:

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

uspace/srv/devman/devman.c

@@ -34 +34 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <ipc/driver.h>
+#include <ipc/devman.h>
 
 #include "devman.h"
@@ -308 +310 @@
 }
 
-/** Create root device node of the device tree.
- * 
- * @return root device node.
- */
-node_t * create_root_node()
+/** Create root device node in the device tree.
+ * 
+ * @param tree the device tree.
+ * @return true on success, false otherwise.
+ */
+bool create_root_node(dev_tree_t *tree)
 {
         printf(NAME ": create_root_node\n");
         node_t *node = create_dev_node();
         if (node) {
-                init_dev_node(node, NULL);
+                insert_dev_node(tree, node, NULL);
                 match_id_t *id = create_match_id();
                 id->id = "root";
                 id->score = 100;
                 add_match_id(&node->match_ids, id);
-        }
-        return node;    
+                tree->root_node = node;
+        }
+        return node != NULL;    
 }
 
@@ -448 +452 @@
         link_t *link;
         
-        link = driver->devices.next;
-        while (link != &driver->devices) {
-                dev = list_get_instance(link, node_t, driver_devices);
-                add_device(driver, dev);
-                link = link->next;
-        }       
+        int phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+        
+        if (0 < phone) {
+                
+                link = driver->devices.next;
+                while (link != &driver->devices) {
+                        dev = list_get_instance(link, node_t, driver_devices);
+                        add_device(phone, driver, dev);
+                        link = link->next;
+                }
+                
+                ipc_hangup(phone);
+        }
 }
 
@@ -463 +474 @@
  */
 void initialize_running_driver(driver_t *driver) 
-{
+{       
         fibril_mutex_lock(&driver->driver_mutex);
         
@@ -480 +491 @@
  * @param node the device's node in the device tree.
  */
-void add_device(driver_t *drv, node_t *node)
+void add_device(int phone, driver_t *drv, node_t *node)
 {
         printf(NAME ": add_device\n");
-        
-        // TODO
-        
-        // pass a new device to the running driver, which was previously assigned to it
-                // send the phone of the parent's driver and device's handle within the parent's driver to the driver 
-                // let the driver to probe the device and specify whether the device is actually present
-                // if the device is present, remember its handle within the driver
+
+        ipcarg_t ret;
+        ipcarg_t rc = async_req_1_1(phone, DRIVER_ADD_DEVICE, node->handle, &ret);
+        if (rc != EOK) {
+                // TODO handle error
+                return false;
+        }
+        
+        // TODO inspect return value (ret) to find out whether the device was successfully probed and added
         
         return true;
 }
 
-/**
+/** 
  * Find suitable driver for a device and assign the driver to it.
  * 
@@ -523 +536 @@
         if (DRIVER_RUNNING == drv->state) {
                 // notify driver about new device
-                add_device(drv, node);          
+                int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                if (phone > 0) {
+                        add_device(phone, drv, node);           
+                        ipc_hangup(phone);
+                }
         }
         
@@ -542 +559 @@
         printf(NAME ": init_device_tree.\n");
         
+        atomic_set(&tree->current_handle, 0);
+        
         // create root node and add it to the device tree
-        if (NULL == (tree->root_node = create_root_node())) {
+        if (!create_root_node(tree)) {
                 return false;
         }