Changeset e4f8c77 in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

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

uspace/srv/devmap/devmap.c

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