Changeset c028b22 in mainline for uspace/srv/devman/devman.h

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (9 diffs)

uspace/srv/devman/devman.h

@@ -44 +44 @@
 #include <fibril_synch.h>
 #include <atomic.h>
+#include <async.h>
 
 #include "util.h"
@@ -87 +88 @@
         int state;
         
-        /** Phone asociated with this driver. */
-        int phone;
+        /** Session asociated with this driver. */
+        async_sess_t *sess;
         /** Name of the device driver. */
         char *name;
@@ -95 +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;
-        
-        /**
-         * Fibril mutex for this driver - driver state, list of devices, phone.
+        /** List of devices controlled by this driver. */
+        list_t devices;
+        
+        /**
+         * Fibril mutex for this driver - driver state, list of devices, session.
          */
         fibril_mutex_t driver_mutex;
@@ -107 +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;
@@ -129 +130 @@
         
         /** List of device functions. */
-        link_t functions;
+        list_t functions;
         /** Driver of this device. */
         driver_t *drv;
@@ -169 +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;
@@ -227 +228 @@
          * this class.
          */
-        link_t devices;
+        list_t devices;
         
         /**
@@ -279 +280 @@
 typedef struct class_list {
         /** List of classes. */
-        link_t classes;
+        list_t classes;
         
         /**
@@ -312 +313 @@
 extern void add_driver(driver_list_t *, driver_t *);
 extern void attach_driver(dev_node_t *, driver_t *);
-extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *);
+extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);