Changeset 1affcdf3 in mainline for uspace/srv/devman/devman.h

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (4 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;
@@ -99 +100 @@
         
         /**
-         * Fibril mutex for this driver - driver state, list of devices, phone.
+         * Fibril mutex for this driver - driver state, list of devices, session.
          */
         fibril_mutex_t driver_mutex;
@@ -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 *);