Changeset e950803 in mainline for uspace/srv

Timestamp:

2011-02-03T20:20:01Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bfe43d5

Parents:

bd81386 (diff), b366a1bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/fs.

Location:

uspace/srv

Files:

• devman/devman.c (modified) (1 diff)
• devmap/devmap.c (modified) (3 diffs)
• fs/devfs/devfs_ops.c (modified) (4 diffs)

uspace/srv/devman/devman.c

@@ -1063 +1063 @@
         if (info != NULL) {
                 memset(info, 0, sizeof(dev_class_info_t));
-                list_initialize(&info->dev_classes);
-                list_initialize(&info->devmap_link);
-                list_initialize(&info->link);
+                link_initialize(&info->dev_classes);
+                link_initialize(&info->devmap_link);
+                link_initialize(&info->link);
         }
         

uspace/srv/devmap/devmap.c

@@ -423 +423 @@
          */
         list_initialize(&driver->devices);
-        list_initialize(&(driver->drivers));
+
+        link_initialize(&driver->drivers);
         
         fibril_mutex_lock(&drivers_list_mutex);
@@ -538 +539 @@
         }
         
-        list_initialize(&(device->devices));
-        list_initialize(&(device->driver_devices));
+        link_initialize(&device->devices);
+        link_initialize(&device->driver_devices);
         
         /* Check that device is not already registered */
@@ -942 +943 @@
         }
         
-        list_initialize(&(device->devices));
-        list_initialize(&(device->driver_devices));
+        link_initialize(&device->devices);
+        link_initialize(&device->driver_devices);
         
         /* Get unique device handle */

uspace/srv/fs/devfs/devfs_ops.c

@@ -130 +130 @@
 {
         devfs_node_t *node = (devfs_node_t *) pfn->data;
+        int ret;
         
         if (node->handle == 0) {
@@ -145 +146 @@
                                 
                                 if (str_cmp(devs[pos].name, component) == 0) {
+                                        ret = devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle);
                                         free(devs);
-                                        return devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle);
+                                        return ret;
                                 }
                         }
@@ -162 +164 @@
                                 for (pos = 0; pos < count; pos++) {
                                         if (str_cmp(devs[pos].name, component) == 0) {
+                                                ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
                                                 free(devs);
-                                                return devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
+                                                return ret;
                                         }
                                 }
@@ -184 +187 @@
                         for (pos = 0; pos < count; pos++) {
                                 if (str_cmp(devs[pos].name, component) == 0) {
+                                        ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
                                         free(devs);
-                                        return devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
+                                        return ret;
                                 }
                         }