Changeset 08d9c4e6 in mainline for uspace/srv/devman/devman.h

Timestamp:

2010-02-15T21:04:59Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

e85920d

Parents:

e2b9a993

Message:

device manager - initialization of the list of available drivers

File:

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

uspace/srv/devman/devman.h

@@ -30 +30 @@
  * @{
  */
- 
+
 #ifndef DEVMAN_H_
 #define DEVMAN_H_
@@ -41 +41 @@
 #include <ipc/ipc.h>
 
+#include "util.h"
 
 #define NAME "devman"
@@ -97 +98 @@
         node_t *parent;
         /** Pointers to previous and next child devices in the linked list of parent device's node.*/
-        link_t sibling; 
+        link_t sibling;
         /** List of child device nodes. */
         link_t children;
         /** List of device ids for device-to-driver matching.*/
-        match_id_list_t match_ids;      
+        match_id_list_t match_ids;
         /** Driver of this device.*/
-        driver_t *drv;  
+        driver_t *drv;
         /** Pointer to the previous and next device in the list of devices
             owned by one driver */
-        link_t driver_devices;  
+        link_t driver_devices;
 };
 
@@ -130 +131 @@
 
 
-static inline match_id_t * create_match_id() 
+static inline match_id_t * create_match_id()
 {
         match_id_t *id = malloc(sizeof(match_id_t));
         memset(id, 0, sizeof(match_id_t));
-        return id;      
-}
-
-static inline void delete_match_id(match_id_t *id) 
-{
-        free(id->id);
-        free(id);
+        return id;
+}
+
+static inline void delete_match_id(match_id_t *id)
+{
+        if (id) {
+                free_not_null(id->id);
+                free(id);
+        }
 }
 
@@ -152 +155 @@
 bool assign_driver(node_t *node, link_t *drivers_list);
 
-void attach_driver(node_t *node, driver_t *drv); 
+void attach_driver(node_t *node, driver_t *drv);
 bool add_device(driver_t *drv, node_t *node);
 bool start_driver(driver_t *drv);
 
 
-static inline void init_driver(driver_t *drv) 
-{
-        assert(drv != NULL);    
-        
-        memset(drv, 0, sizeof(driver_t));       
+static inline void init_driver(driver_t *drv)
+{
+        printf(NAME ": init_driver\n");
+        assert(drv != NULL);
+
+        memset(drv, 0, sizeof(driver_t));
         list_initialize(&drv->match_ids.ids);
         list_initialize(&drv->devices);
 }
 
-static inline void clean_driver(driver_t *drv) 
-{
+static inline void clean_driver(driver_t *drv)
+{
+        printf(NAME ": clean_driver\n");
         assert(drv != NULL);
+
+        free_not_null(drv->name);
+        free_not_null(drv->binary_path); 
+
+        clean_match_ids(&drv->match_ids);
+
+        init_driver(drv);
+}
+
+static inline void delete_driver(driver_t *drv)
+{
+        printf(NAME ": delete_driver\n");
+        assert(NULL != drv);
         
-        free(drv->name);
-        free(drv->binary_path);
-        
-        clean_match_ids(&drv->match_ids);
-        
-        init_driver(drv);       
-}
-
-static inline void delete_driver(driver_t *drv) 
-{
         clean_driver(drv);
         free(drv);
@@ -187 +195 @@
 {
         list_prepend(&drv->drivers, drivers_list);
-        printf(NAME": the '%s' driver was added to the list of available drivers.\n", drv->name);       
+        printf(NAME": the '%s' driver was added to the list of available drivers.\n", drv->name);
 }
 
@@ -198 +206 @@
         node_t *res = malloc(sizeof(node_t));
         if (res != NULL) {
-                memset(res, 0, sizeof(node_t)); 
+                memset(res, 0, sizeof(node_t));
         }
         return res;
 }
 
-static inline void init_dev_node(node_t *node, node_t *parent) 
+static inline void init_dev_node(node_t *node, node_t *parent)
 {
         assert(NULL != node);
-        
+
         node->parent = parent;
         if (NULL != parent) {
                 list_append(&node->sibling, &parent->children);
         }
-        
+
         list_initialize(&node->children);
-        
-        list_initialize(&node->match_ids.ids);  
+
+        list_initialize(&node->match_ids.ids);
 }