Changes in uspace/srv/devmap/devmap.c [b72efe8:9934f7d] in mainline

File:

• uspace/srv/devmap/devmap.c (modified) (10 diffs)

uspace/srv/devmap/devmap.c

@@ -57 +57 @@
  */
 typedef struct {
-        /** Link to drivers_list */
+        /** Pointers to previous and next drivers in linked list */
         link_t drivers;
         
-        /** List of devices controlled by this driver */
-        list_t devices;
+        /** Pointer to the linked list of devices controlled by this driver */
+        link_t devices;
         
         /** Session asociated with this driver */
@@ -77 +77 @@
  */
 typedef struct {
-        /** Link to namespaces_list */
+        /** Pointer to the previous and next device in the list of all namespaces */
         link_t namespaces;
         
@@ -94 +94 @@
  */
 typedef struct {
-        /** Link to global list of devices (devices_list) */
+        /** Pointer to the previous and next device in the list of all devices */
         link_t devices;
-        /** Link to driver list of devices (devmap_driver_t.devices) */
+        /** Pointer to the previous and next device in the list of devices
+            owned by one driver */
         link_t driver_devices;
         /** Unique device identifier */
@@ -224 +225 @@
 static devmap_namespace_t *devmap_namespace_find_name(const char *name)
 {
+        link_t *item;
+        
         assert(fibril_mutex_is_locked(&devices_list_mutex));
         
-        list_foreach(namespaces_list, item) {
+        for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
                     list_get_instance(item, devmap_namespace_t, namespaces);
@@ -243 +246 @@
 static devmap_namespace_t *devmap_namespace_find_handle(devmap_handle_t handle)
 {
+        link_t *item;
+        
         assert(fibril_mutex_is_locked(&devices_list_mutex));
         
-        list_foreach(namespaces_list, item) {
+        for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
                     list_get_instance(item, devmap_namespace_t, namespaces);
@@ -259 +264 @@
     const char *name)
 {
+        link_t *item;
+        
         assert(fibril_mutex_is_locked(&devices_list_mutex));
         
-        list_foreach(devices_list, item) {
+        for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
                     list_get_instance(item, devmap_device_t, devices);
@@ -279 +286 @@
 static devmap_device_t *devmap_device_find_handle(devmap_handle_t handle)
 {
+        link_t *item;
+        
         assert(fibril_mutex_is_locked(&devices_list_mutex));
         
-        list_foreach(devices_list, item) {
+        for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
                     list_get_instance(item, devmap_device_t, devices);
@@ -464 +473 @@
         fibril_mutex_lock(&driver->devices_mutex);
         
-        while (!list_empty(&driver->devices)) {
-                devmap_device_t *device = list_get_instance(
-                    list_first(&driver->devices), devmap_device_t,
-                    driver_devices);
+        while (!list_empty(&(driver->devices))) {
+                devmap_device_t *device = list_get_instance(driver->devices.next,
+                    devmap_device_t, driver_devices);
                 devmap_device_unregister_core(device);
         }
@@ -807 +815 @@
         }
         
+        link_t *item;
         size_t pos = 0;
-        list_foreach(namespaces_list, item) {
+        for (item = namespaces_list.next; item != &namespaces_list;
+            item = item->next) {
                 devmap_namespace_t *namespace =
                     list_get_instance(item, devmap_namespace_t, namespaces);
@@ -871 +881 @@
         }
         
+        link_t *item;
         size_t pos = 0;
-        list_foreach(devices_list, item) {
+        for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
                     list_get_instance(item, devmap_device_t, devices);