Changeset e85920d in mainline

Timestamp:

2010-02-18T15:23:15Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0c3666d

Parents:

08d9c4e6

Message:

parts of device manager

Location:

uspace/srv/devman

Files:

• devman.c (modified) (9 diffs)
• devman.h (modified) (5 diffs)

uspace/srv/devman/devman.c

@@ -244 +244 @@
 node_t * create_root_node()
 {
+        printf(NAME ": create_root_node\n");
         node_t *node = create_dev_node();
         if (node) {
@@ -257 +258 @@
 driver_t * find_best_match_driver(link_t *drivers_list, node_t *node)
 {
+        printf(NAME ": find_best_match_driver\n");
         driver_t *best_drv = NULL, *drv = NULL;
         int best_score = 0, score = 0;
@@ -267 +269 @@
                         best_score = score;
                         best_drv = drv;
-                }               
+                }       
+                link = link->next;
         }       
         
@@ -281 +284 @@
 bool start_driver(driver_t *drv)
 {
+        printf(NAME ": start_driver\n");
+        
         char *argv[2];
         
@@ -293 +298 @@
         }
         
+        drv->state = DRIVER_STARTING;
         return true;
 }
@@ -298 +304 @@
 bool add_device(driver_t *drv, node_t *node)
 {
+        printf(NAME ": add_device\n");
+        
         // TODO
         
@@ -310 +318 @@
 bool assign_driver(node_t *node, link_t *drivers_list) 
 {
+        printf(NAME ": assign_driver\n");
+        
         // find the driver which is the most suitable for handling this device
         driver_t *drv = find_best_match_driver(drivers_list, node);
         if (NULL == drv) {
+                printf(NAME ": no driver found for device.\n"); 
                 return false;           
         }
@@ -319 +330 @@
         attach_driver(node, drv);
         
-        if (!drv->running) {
+        if (DRIVER_NOT_STARTED == drv->state) {
                 // start driver
                 start_driver(drv);
-        } else {
+        } 
+        
+        if (DRIVER_RUNNING == drv->state) {
                 // notify driver about new device
                 add_device(drv, node);          
@@ -332 +345 @@
 bool init_device_tree(dev_tree_t *tree, link_t *drivers_list)
 {
-        printf(NAME ": init_device_tree.");
+        printf(NAME ": init_device_tree.\n");
         // create root node and add it to the device tree
         if (NULL == (tree->root_node = create_root_node())) {

uspace/srv/devman/devman.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <ipc/ipc.h>
+#include <fibril_synch.h>
 
 #include "util.h"
@@ -74 +75 @@
 } match_id_list_t;
 
+typedef enum {
+        /** driver has not been started */
+        DRIVER_NOT_STARTED = 0,
+        /** driver has been started, but has not registered as running and ready to receive requests */
+        DRIVER_STARTING,
+        /** driver is running and prepared to serve incomming requests */
+        DRIVER_RUNNING
+} driver_state_t;
+
 /** Representation of device driver.
  */
@@ -79 +89 @@
         /** Pointers to previous and next drivers in a linked list */
         link_t drivers;
-        /** Specifies whether the driver has been started.*/
-        bool running;
+        /** Specifies whether the driver has been started and wheter is running and prepared to receive requests.*/
+        int state;
         /** Phone asociated with this driver */
         ipcarg_t phone;
@@ -91 +101 @@
         /** Pointer to the linked list of devices controlled by this driver */
         link_t devices;
+        /** Fibril mutex for this driver - driver state, list of devices, phone.*/
+        fibril_mutex_t driver_mutex;
 } driver_t;
+
+/** The list of drivers. */
+typedef struct driver_list {
+        /** List of drivers */
+        link_t drivers;
+        /** Fibril mutex for list of drivers. */
+        fibril_mutex_t drivers_mutex;   
+} driver_list_t;
 
 /** Representation of a node in the device tree.*/
@@ -101 +121 @@
         /** List of child device nodes. */
         link_t children;
+        /** Fibril mutex for the list of child device nodes of this node. */
+        fibril_mutex_t children_mutex;
         /** List of device ids for device-to-driver matching.*/
         match_id_list_t match_ids;