Changeset 58b833c in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-10-23T13:43:51Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b11576d, c6c389ed

Parents:

667eac4

Message:

More cstyle in devman.

File:

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

uspace/srv/devman/devman.c

@@ -47 +47 @@
 }
 
-static int
-devman_devices_compare(unsigned long key[], hash_count_t keys, link_t *item)
+static int devman_devices_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
 {
         node_t *dev = hash_table_get_instance(item, node_t, devman_link);
@@ -54 +54 @@
 }
 
-static int
-devmap_devices_compare(unsigned long key[], hash_count_t keys, link_t *item)
+static int devmap_devices_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
 {
         node_t *dev = hash_table_get_instance(item, node_t, devmap_link);
@@ -79 +79 @@
 /** Allocate and initialize a new driver structure.
  *
- * @return              Driver structure.
+ * @return      Driver structure.
  */
 driver_t *create_driver(void)
-{       
+{
         driver_t *res = malloc(sizeof(driver_t));
         if (res != NULL)
@@ -91 +91 @@
 /** Add a driver to the list of drivers.
  *
- * @param drivers_list the list of drivers.
- * @param drv the driver's structure.
+ * @param drivers_list  List of drivers.
+ * @param drv           Driver structure.
  */
 void add_driver(driver_list_t *drivers_list, driver_t *drv)
@@ -99 +99 @@
         list_prepend(&drv->drivers, &drivers_list->drivers);
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
-        
+
         printf(NAME": the '%s' driver was added to the list of available "
             "drivers.\n", drv->name);
@@ -218 +218 @@
                     "'%s'.\n", conf_path);
                 goto cleanup;
-        }       
-        
-        if (0 >= read(fd, buf, len)) {
+        }
+        
+        if (read(fd, buf, len) <= 0) {
                 printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
@@ -231 +231 @@
         free(buf);
         
-        if(opened)
+        if (opened)
                 close(fd);
         
@@ -270 +270 @@
         /* Read the list of match ids from the driver's configuration file. */
         match_path = get_abs_path(base_path, name, MATCH_EXT);
-        if (NULL == match_path)
+        if (match_path == NULL)
                 goto cleanup;
         
@@ -279 +279 @@
         name_size = str_size(name) + 1;
         drv->name = malloc(name_size);
-        if (!drv->name)
+        if (drv->name == NULL)
                 goto cleanup;
         str_cpy(drv->name, name_size, name);
@@ -285 +285 @@
         /* Initialize path with driver's binary. */
         drv->binary_path = get_abs_path(base_path, name, "");
-        if (NULL == drv->binary_path)
+        if (drv->binary_path == NULL)
                 goto cleanup;
         
         /* Check whether the driver's binary exists. */
         struct stat s;
-        if (stat(drv->binary_path, &s) == ENOENT) {
+        if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
                 printf(NAME ": driver not found at path %s.", drv->binary_path);
                 goto cleanup;
@@ -344 +344 @@
 /** Create root device node in the device tree.
  *
- * @param tree          The device tree.
- * @return              True on success, false otherwise.
+ * @param tree  The device tree.
+ * @return      True on success, false otherwise.
  */
 bool create_root_node(dev_tree_t *tree)
 {
+        node_t *node;
+
         printf(NAME ": create_root_node\n");
-        node_t *node = create_dev_node();
-        if (node) {
+
+        node = create_dev_node();
+        if (node != NULL) {
                 insert_dev_node(tree, node, clone_string(""), NULL);
                 match_id_t *id = create_match_id();
@@ -359 +362 @@
                 tree->root_node = node;
         }
+
         return node != NULL;
 }
@@ -391 +395 @@
                         best_score = score;
                         best_drv = drv;
-                }       
+                }
                 link = link->next;
         }
@@ -436 +440 @@
         
         int err;
-        if (!task_spawn(drv->binary_path, argv, &err)) {
+        if (task_spawn(drv->binary_path, argv, &err) == 0) {
                 printf(NAME ": error spawning %s, errno = %d\n",
                     drv->name, err);
@@ -456 +460 @@
 {
         driver_t *res = NULL;
+        driver_t *drv = NULL;
+        link_t *link;
         
         fibril_mutex_lock(&drv_list->drivers_mutex);
         
-        driver_t *drv = NULL;
-        link_t *link = drv_list->drivers.next;
-        while (link !=  &drv_list->drivers) {
+        link = drv_list->drivers.next;
+        while (link != &drv_list->drivers) {
                 drv = list_get_instance(link, driver_t, drivers);
-                if (0 == str_cmp(drv->name, drv_name)) {
+                if (str_cmp(drv->name, drv_name) == 0) {
                         res = drv;
                         break;
-                }               
+                }
+
                 link = link->next;
-        }       
+        }
         
         fibril_mutex_unlock(&drv_list->drivers_mutex);
@@ -483 +489 @@
 {
         fibril_mutex_lock(&driver->driver_mutex);
-        assert(DRIVER_STARTING == driver->state);
+        assert(driver->state == DRIVER_STARTING);
         driver->phone = phone;
         fibril_mutex_unlock(&driver->driver_mutex);
@@ -496 +502 @@
 static void pass_devices_to_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": pass_devices_to_driver\n");
         node_t *dev;
         link_t *link;
-        
-        int phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
-        
-        if (0 < phone) {
+        int phone;
+
+        printf(NAME ": pass_devices_to_driver\n");
+
+        phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+        if (phone > 0) {
                 
                 link = driver->devices.next;
@@ -549 +556 @@
         
         asprintf(&devmap_name, "%s", node->pathname);
-        if (NULL == devmap_name)
+        if (devmap_name == NULL)
                 return;
         
@@ -556 +563 @@
         asprintf(&devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE,
             devmap_name);
-        if (NULL == devmap_pathname) {
+        if (devmap_pathname == NULL) {
                 free(devmap_name);
                 return;
@@ -623 +630 @@
          */
         driver_t *drv = find_best_match_driver(drivers_list, node);
-        if (NULL == drv) {
+        if (drv == NULL) {
                 printf(NAME ": no driver found for device '%s'.\n",
                     node->pathname);
@@ -632 +639 @@
         attach_driver(node, drv);
         
-        if (DRIVER_NOT_STARTED == drv->state) {
+        if (drv->state == DRIVER_NOT_STARTED) {
                 /* Start the driver. */
                 start_driver(drv);
         }
         
-        if (DRIVER_RUNNING == drv->state) {
+        if (drv->state == DRIVER_RUNNING) {
                 /* Notify the driver about the new device. */
                 int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
@@ -687 +694 @@
 static bool set_dev_path(node_t *node, node_t *parent)
 {
-        assert(NULL != node->name);
+        assert(node->name != NULL);
         
         size_t pathsize = (str_size(node->name) + 1);
-        if (NULL != parent)
+        if (parent != NULL)
                 pathsize += str_size(parent->pathname) + 1;
         
         node->pathname = (char *) malloc(pathsize);
-        if (NULL == node->pathname) {
+        if (node->pathname == NULL) {
                 printf(NAME ": failed to allocate device path.\n");
                 return false;
         }
         
-        if (NULL != parent) {
+        if (parent != NULL) {
                 str_cpy(node->pathname, pathsize, parent->pathname);
                 str_append(node->pathname, pathsize, "/");
@@ -719 +726 @@
  * @param dev_name      The name of the newly added device.
  * @param parent        The parent device node.
+ *
  * @return              True on success, false otherwise (insufficient resources
  *                      etc.).
  */
-bool
-insert_dev_node(dev_tree_t *tree, node_t *node, char *dev_name, node_t *parent)
-{
-        assert(NULL != node && NULL != tree && NULL != dev_name);
+bool insert_dev_node(dev_tree_t *tree, node_t *node, char *dev_name,
+    node_t *parent)
+{
+        assert(node != NULL);
+        assert(tree != NULL);
+        assert(dev_name != NULL);
         
         node->name = dev_name;
@@ -740 +750 @@
         /* Add the node to the list of its parent's children. */
         node->parent = parent;
-        if (NULL != parent)
+        if (parent != NULL)
                 list_append(&node->sibling, &parent->children);
         
@@ -764 +774 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = '/' == rel_path[0];
-        
-        while (cont && NULL != dev) {
+        bool cont = (rel_path[0] == '/');
+        
+        while (cont && dev != NULL) {
                 next_path_elem  = get_path_elem_end(rel_path + 1);
-                if ('/' == next_path_elem[0]) {
+                if (next_path_elem[0] == '/') {
                         cont = true;
                         next_path_elem[0] = 0;
@@ -807 +817 @@
                 dev = list_get_instance(link, node_t, sibling);
                 
-                if (0 == str_cmp(name, dev->name))
+                if (str_cmp(name, dev->name) == 0)
                         return dev;
                 
@@ -829 +839 @@
         const char *base_name;
         
-        if (NULL != base_dev_name)
+        if (base_dev_name != NULL)
                 base_name = base_dev_name;
         else
@@ -853 +863 @@
  *                      with the class.
  */
-dev_class_info_t *
-add_device_to_class(node_t *dev, dev_class_t *cl, const char *base_dev_name)
+dev_class_info_t *add_device_to_class(node_t *dev, dev_class_t *cl,
+    const char *base_dev_name)
 {
         dev_class_info_t *info = create_dev_class_info();
         
-        if (NULL != info) {
+        if (info != NULL) {
                 info->dev_class = cl;
                 info->dev = dev;
@@ -883 +893 @@
         fibril_rwlock_write_lock(&class_list->rwlock);
         cl = find_dev_class_no_lock(class_list, class_name);
-        if (NULL == cl) {
+        if (cl == NULL) {
                 cl = create_dev_class();
-                if (NULL != cl) {
+                if (cl != NULL) {
                         cl->name = class_name;
                         cl->base_dev_name = "";
@@ -891 +901 @@
                 }
         }
+
         fibril_rwlock_write_unlock(&class_list->rwlock);
         return cl;
 }
 
-dev_class_t *
-find_dev_class_no_lock(class_list_t *class_list, const char *class_name)
+dev_class_t *find_dev_class_no_lock(class_list_t *class_list,
+    const char *class_name)
 {
         dev_class_t *cl;
@@ -903 +914 @@
         while (link != &class_list->classes) {
                 cl = list_get_instance(link, dev_class_t, link);
-                if (0 == str_cmp(cl->name, class_name))
+                if (str_cmp(cl->name, class_name) == 0)
                         return cl;
         }
@@ -929 +940 @@
         fibril_rwlock_read_lock(&tree->rwlock);
         link = hash_table_find(&tree->devmap_devices, &key);
-        if (NULL != link)
+        if (link != NULL)
                 dev = hash_table_get_instance(link, node_t, devmap_link);
         fibril_rwlock_read_unlock(&tree->rwlock);
@@ -936 +947 @@
 }
 
-node_t *
-find_devmap_class_device(class_list_t *classes, dev_handle_t devmap_handle)
+node_t *find_devmap_class_device(class_list_t *classes,
+    dev_handle_t devmap_handle)
 {
         node_t *dev = NULL;
@@ -946 +957 @@
         fibril_rwlock_read_lock(&classes->rwlock);
         link = hash_table_find(&classes->devmap_devices, &key);
-        if (NULL != link) {
+        if (link != NULL) {
                 cli = hash_table_get_instance(link, dev_class_info_t,
                     devmap_link);