Changeset 3842a955 in mainline for uspace/srv/devman/devman.h

Timestamp:

2011-06-19T15:59:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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 mainline changes

File:

• uspace/srv/devman/devman.h (modified) (6 diffs)

uspace/srv/devman/devman.h

@@ -96 +96 @@
         /** List of device ids for device-to-driver matching. */
         match_id_list_t match_ids;
-        /** Pointer to the linked list of devices controlled by this driver. */
-        link_t devices;
+        /** List of devices controlled by this driver. */
+        list_t devices;
         
         /**
@@ -108 +108 @@
 typedef struct driver_list {
         /** List of drivers */
-        link_t drivers;
+        list_t drivers;
         /** Fibril mutex for list of drivers. */
         fibril_mutex_t drivers_mutex;
@@ -130 +130 @@
         
         /** List of device functions. */
-        link_t functions;
+        list_t functions;
         /** Driver of this device. */
         driver_t *drv;
@@ -170 +170 @@
         match_id_list_t match_ids;
         
-        /** The list of device classes to which this device function belongs. */
-        link_t classes;
+        /** List of device classes to which this device function belongs. */
+        list_t classes;
         /** Devmap handle if the device function is registered by devmap. */
         devmap_handle_t devmap_handle;
@@ -228 +228 @@
          * this class.
          */
-        link_t devices;
+        list_t devices;
         
         /**
@@ -280 +280 @@
 typedef struct class_list {
         /** List of classes. */
-        link_t classes;
+        list_t classes;
         
         /**