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

Timestamp:

2010-03-14T09:14:50Z (15 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.h (modified) (7 diffs)

uspace/srv/devman/devman.h

@@ -41 +41 @@
 #include <ipc/ipc.h>
 #include <fibril_synch.h>
+#include <atomic.h>
 
 #include "util.h"
@@ -115 +116 @@
 /** Representation of a node in the device tree.*/
 struct node {
+        /** The global unique identifier of the device.*/
+        long handle;
         /** The node of the parent device. */
         node_t *parent;
@@ -137 +140 @@
         /** Root device node. */
         node_t *root_node;
+        atomic_t current_handle;
 } dev_tree_t;
 
@@ -191 +195 @@
 void add_driver(driver_list_t *drivers_list, driver_t *drv);
 void attach_driver(node_t *node, driver_t *drv);
-void add_device(driver_t *drv, node_t *node);
+void add_device(int phone, driver_t *drv, node_t *node);
 bool start_driver(driver_t *drv);
 
@@ -230 +234 @@
 
 // Device nodes
-node_t * create_root_node();
 
 static inline node_t * create_dev_node()
@@ -238 +241 @@
                 memset(res, 0, sizeof(node_t));
         }
+        
+        list_initialize(&res->children);
+        list_initialize(&res->match_ids.ids);
+        
         return res;
 }
 
-static inline void init_dev_node(node_t *node, node_t *parent)
-{
-        assert(NULL != node);
+static inline void insert_dev_node(dev_tree_t *tree, node_t *node, node_t *parent)
+{
+        assert(NULL != node && NULL != tree);
+        
+        node->handle = atomic_postinc(&tree->current_handle);
 
         node->parent = parent;
         if (NULL != parent) {
+                fibril_mutex_lock(&parent->children_mutex);
                 list_append(&node->sibling, &parent->children);
+                fibril_mutex_unlock(&parent->children_mutex);
         }
-
-        list_initialize(&node->children);
-
-        list_initialize(&node->match_ids.ids);
 }
 
@@ -259 +266 @@
 
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list);
+bool create_root_node(dev_tree_t *tree);