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

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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) (2 diffs)

uspace/srv/devman/devman.h

@@ -88 +88 @@
         
         /** Phone asociated with this driver. */
-        sysarg_t phone;
+        int phone;
         /** Name of the device driver. */
         char *name;
@@ -316 +316 @@
 
 extern driver_t *find_driver(driver_list_t *, const char *);
-extern void set_driver_phone(driver_t *, sysarg_t);
 extern void initialize_running_driver(driver_t *, dev_tree_t *);