Changeset 5cd136ab in mainline for uspace/srv/devman

Timestamp:

2010-04-02T13:37:58Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

9a66bc2e

Parents:

57937dd

Message:

device interfaces and driver cooperation - parts of code

Location:

uspace/srv/devman

Files:

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

uspace/srv/devman/devman.c

@@ -506 +506 @@
         if (rc != EOK) {
                 // TODO handle error
-                return false;
+                return;
         }
         
         // TODO inspect return value (ret) to find out whether the device was successfully probed and added
         
-        return true;
+        return;
 }
 
@@ -618 +618 @@
  * @return true on success, false otherwise (insufficient resources etc.).
  */
-bool insert_dev_node(dev_tree_t *tree, node_t *node, const char *dev_name, node_t *parent)
+bool insert_dev_node(dev_tree_t *tree, node_t *node, char *dev_name, node_t *parent)
 {
         printf(NAME ": insert_dev_node\n");
@@ -650 +650 @@
 }
 
+/** 
+ * Find device node with a specified path in the device tree.
+ * 
+ * @param path the path of the device node in the device tree.
+ * @param tree the device tree.
+ * 
+ * @return the device node if it is present in the tree, NULL otherwise.
+ */
+node_t * find_dev_node_by_path(dev_tree_t *tree, char *path)
+{
+        node_t *dev = tree->root_node;
+        char *rel_path = path;
+        char *next_path_elem = NULL;
+        size_t elem_size = 0;
+        bool cont = '/' == rel_path[0];
+        
+        while (cont && NULL != dev) {           
+                next_path_elem  = get_path_elem_end(rel_path+1);                
+                if ('/' == next_path_elem[0]) {
+                        cont = true;
+                        next_path_elem[0] = 0;
+                } else {
+                        cont = false;
+                }
+                
+                dev = find_node_child(dev, rel_path);           
+                
+                if (cont) {
+                        next_path_elem[0] = '/';
+                }
+                rel_path = next_path_elem;              
+        }
+        
+        return dev;
+}
+
+/**
+ * Find child device node with a specified name.
+ * 
+ * @param parent the parent device node.
+ * @param name the name of the child device node.
+ * 
+ * @return the child device node.
+ */
+node_t *find_node_child(node_t *parent, const char *name)
+{
+        node_t *dev;
+        link_t *link;
+        
+        fibril_mutex_lock(&parent->children_mutex);             
+        link = parent->children.next;
+        
+        while (link != &parent->children) {
+                dev = list_get_instance(link, node_t, sibling);
+                
+                if (0 == str_cmp(name, dev->name)) {
+                        fibril_mutex_unlock(&parent->children_mutex);
+                        return dev;                     
+                }
+        }       
+        
+        fibril_mutex_unlock(&parent->children_mutex);   
+        return NULL;
+}
+
 /** @}
  */

uspace/srv/devman/devman.h

@@ -238 +238 @@
 }
 
+/**
+ * Delete a device node.
+ * 
+ * @param node a device node structure.
+ * 
+ */
 static inline void delete_dev_node(node_t *node)
 {
@@ -263 +269 @@
 }
 
+node_t * find_dev_node_by_path(dev_tree_t *tree, char *path);
+node_t *find_node_child(node_t *parent, const char *name);
+
 // Device tree
 
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list);
 bool create_root_node(dev_tree_t *tree);
-bool insert_dev_node(dev_tree_t *tree, node_t *node, const char *dev_name, node_t *parent);
+bool insert_dev_node(dev_tree_t *tree, node_t *node, char *dev_name, node_t *parent);
 
 #endif

uspace/srv/devman/main.c

@@ -51 +51 @@
 #include <ctype.h>
 #include <ipc/devman.h>
+#include <ipc/driver.h>
 #include <thread.h>
 
@@ -158 +159 @@
 {
         int ret = EOK;
-        int i;
+        size_t i;
         for (i = 0; i < match_count; i++) {
                 if (EOK != (ret = devman_receive_match_id(match_ids))) {
@@ -257 +258 @@
 }
 
+static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, bool drv_to_parent) {
+        device_handle_t handle;
+        node_t *dev = find_dev_node(&device_tree, handle);
+        if (NULL == dev) {
+                ipc_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        driver_t *driver = NULL;
+        
+        if (drv_to_parent) {
+                driver = dev->parent->drv;
+        } else {
+                driver = dev->drv;              
+        }
+        
+        if (NULL == driver) {           
+                ipc_answer_0(iid, ENOENT);
+                return; 
+        }
+        
+        int method;     
+        if (drv_to_parent) {
+                method = DRIVER_DRIVER;
+        } else {
+                method = DRIVER_CLIENT;
+        }
+        
+        ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);      
+}
+
 /** Function for handling connections to device manager.
  *
@@ -269 +301 @@
         /*case DEVMAN_CLIENT:
                 devmap_connection_client(iid, icall);
-                break;
+                break;*/
         case DEVMAN_CONNECT_TO_DEVICE:
                 // Connect client to selected device
-                devmap_forward(iid, icall);
-                break;*/
+                devman_forward(iid, icall, false);
+                break;
+        case DEVMAN_CONNECT_TO_PARENTS_DEVICE:
+                // Connect client to selected device
+                devman_forward(iid, icall, true);
+                break;          
         default:
                 /* No such interface */

uspace/srv/devman/util.c

@@ -61 +61 @@
         return res;
 }
+
+const char * get_path_elem_end(const char *path)
+{
+        while (0 != *path && '/' != *path) {
+                path++;
+        }
+        return path;
+}

uspace/srv/devman/util.h

@@ -38 +38 @@
 
 char * get_abs_path(const char *base_path, const char *name, const char *ext);
+const char * get_path_elem_end(const char *path);
 
 static inline bool skip_spaces(const char **buf)