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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

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

uspace/srv/devman/devman.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <adt/hash_table.h>
-#include <ipc/ipc.h>
 #include <ipc/devman.h>
 #include <ipc/devmap.h>
@@ -86 +85 @@
         
         /** Phone asociated with this driver. */
-        ipcarg_t phone;
+        sysarg_t phone;
         /** Name of the device driver. */
         char *name;
@@ -168 +167 @@
          */
         link_t devmap_link;
+
+        /**
+         * Whether this device was already passed to the driver.
+         */
+        bool passed_to_driver;
 };
 
@@ -297 +301 @@
 
 extern driver_t *find_driver(driver_list_t *, const char *);
-extern void set_driver_phone(driver_t *, ipcarg_t);
+extern void set_driver_phone(driver_t *, sysarg_t);
 extern void initialize_running_driver(driver_t *, dev_tree_t *);