Changeset c028b22 in mainline for uspace/lib/drv/include/ddf/driver.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/lib/drv/include/ddf/driver.h (modified) (3 diffs)

uspace/lib/drv/include/ddf/driver.h

@@ -37 +37 @@
 #define DDF_DRIVER_H_
 
+#include <async.h>
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-
 #include "../dev_iface.h"
 
@@ -83 +83 @@
         
         /**
-         * Phone to the parent device driver (if it is different from this
+         * Session to the parent device driver (if it is different from this
          * driver)
          */
-        int parent_phone;
+        async_sess_t *parent_sess;
         
         /** Device name */
@@ -118 +118 @@
         /** Implementation of operations provided by this function */
         ddf_dev_ops_t *ops;
+        /** Connection handler or @c NULL to use the DDF default handler. */
+        async_client_conn_t conn_handler;
         
         /** Link in the list of functions handled by the driver */