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

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.h (modified) (11 diffs)

uspace/srv/devman/devman.h

@@ -222 +222 @@
 } dev_class_t;
 
-/** Provides n-to-m mapping between device nodes and classes - each device may
+/**
+ * Provides n-to-m mapping between device nodes and classes - each device may
  * be register to the arbitrary number of classes and each class may contain
  * the arbitrary number of devices.
@@ -290 +291 @@
 static inline void init_driver_list(driver_list_t *drv_list)
 {
-        assert(NULL != drv_list);
+        assert(drv_list != NULL);
         
         list_initialize(&drv_list->drivers);
@@ -348 +349 @@
 static inline void delete_driver(driver_t *drv)
 {
-        assert(NULL != drv);
+        assert(drv != NULL);
         
         clean_driver(drv);
@@ -382 +383 @@
 {
         assert(list_empty(&node->children));
-        assert(NULL == node->parent);
-        assert(NULL == node->drv);
+        assert(node->parent == NULL);
+        assert(node->drv == NULL);
         
         clean_match_ids(&node->match_ids);
@@ -399 +400 @@
  * @return              The device node.
  */
-static inline node_t *
-find_dev_node_no_lock(dev_tree_t *tree, device_handle_t handle)
+static inline node_t *find_dev_node_no_lock(dev_tree_t *tree,
+    device_handle_t handle)
 {
         unsigned long key = handle;
@@ -413 +414 @@
  * @return              The device node.
  */
-static inline node_t *
-find_dev_node(dev_tree_t *tree, device_handle_t handle)
+static inline node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle)
 {
         node_t *node = NULL;
@@ -440 +440 @@
 /** Create device class.
  *
- * @return              Device class.
+ * @return      Device class.
  */
 static inline dev_class_t *create_dev_class(void)
@@ -447 +447 @@
         
         cl = (dev_class_t *) malloc(sizeof(dev_class_t));
-        if (NULL != cl) {
+        if (cl != NULL) {
                 memset(cl, 0, sizeof(dev_class_t));
                 list_initialize(&cl->devices);
@@ -465 +465 @@
         
         info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
-        if (NULL != info)
+        if (info != NULL)
                 memset(info, 0, sizeof(dev_class_info_t));
         
@@ -491 +491 @@
 extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
 
-static inline void
-add_dev_class_no_lock(class_list_t *class_list, dev_class_t *cl)
+static inline void add_dev_class_no_lock(class_list_t *class_list,
+    dev_class_t *cl)
 {
         list_append(&cl->link, &class_list->classes);
@@ -503 +503 @@
 extern node_t *find_devmap_class_device(class_list_t *, dev_handle_t);
 
-static inline void
-class_add_devmap_device(class_list_t *class_list, dev_class_info_t *cli)
+static inline void class_add_devmap_device(class_list_t *class_list,
+    dev_class_info_t *cli)
 {
         unsigned long key = (unsigned long) cli->devmap_handle;