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

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.c (modified) (3 diffs)

uspace/srv/devman/devman.c

@@ -39 +39 @@
 #include <devmap.h>
 #include <str_error.h>
+#include <stdio.h>
 
 #include "devman.h"
@@ -555 +556 @@
 }
 
-/** Remember the driver's phone.
- *
- * @param driver        The driver.
- * @param phone         The phone to the driver.
- */
-void set_driver_phone(driver_t *driver, sysarg_t phone)
-{
-        fibril_mutex_lock(&driver->driver_mutex);
-        assert(driver->state == DRIVER_STARTING);
-        driver->phone = phone;
-        fibril_mutex_unlock(&driver->driver_mutex);
-}
-
 /** Notify driver about the devices to which it was assigned.
  *
@@ -685 +673 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
+        drv->phone = -1;
 }