Index: uspace/srv/devman/devman.c
===================================================================
--- uspace/srv/devman/devman.c	(revision 92413defc319a30e0b83ed8a0996c59ffd9cd882)
+++ uspace/srv/devman/devman.c	(revision 67ba3090d4246ace5e0aefc167571850e5b115b1)
@@ -428,12 +428,57 @@
 }
 
+void set_driver_phone(driver_t *driver, ipcarg_t phone)
+{		
+	fibril_mutex_lock(&driver->driver_mutex);	
+	assert(DRIVER_STARTING == driver->state);
+	driver->phone = phone;	
+	fibril_mutex_unlock(&driver->driver_mutex);	
+}
+
+/**
+ * Notify driver about the devices to which it was assigned.
+ * 
+ * The driver's mutex must be locked.
+ * 
+ * @param driver the driver to which the devices are passed.
+ */
+static void pass_devices_to_driver(driver_t *driver)
+{	
+	node_t *dev;
+	link_t *link;
+	
+	link = driver->devices.next;
+	while (link != &driver->devices) {
+		dev = list_get_instance(link, node_t, driver_devices);
+		add_device(driver, dev);
+		link = link->next;
+	}	
+}
+
+/** Finish the initialization of a driver after it has succesfully started and registered itself by the device manager.
+ * 
+ * Pass devices formerly matched to the driver to the driver and remember the driver is running and fully functional now.
+ * 
+ * @param driver the driver which registered itself as running by the device manager.
+ */
+void initialize_running_driver(driver_t *driver) 
+{
+	fibril_mutex_lock(&driver->driver_mutex);
+	
+	// pass devices which have been already assigned to the driver to the driver
+	pass_devices_to_driver(driver);	
+	
+	// change driver's state to running
+	driver->state = DRIVER_RUNNING;	
+	
+	fibril_mutex_unlock(&driver->driver_mutex);
+}
+
 /** Pass a device to running driver.
  * 
  * @param drv the driver's structure.
  * @param node the device's node in the device tree.
- * 
- * @return true on success, false otherwise.
- */
-bool add_device(driver_t *drv, node_t *node)
+ */
+void add_device(driver_t *drv, node_t *node)
 {
 	printf(NAME ": add_device\n");
@@ -506,2 +551,4 @@
 }
 
+/** @}
+ */
Index: uspace/srv/devman/devman.h
===================================================================
--- uspace/srv/devman/devman.h	(revision 92413defc319a30e0b83ed8a0996c59ffd9cd882)
+++ uspace/srv/devman/devman.h	(revision 67ba3090d4246ace5e0aefc167571850e5b115b1)
@@ -191,8 +191,10 @@
 void add_driver(driver_list_t *drivers_list, driver_t *drv);
 void attach_driver(node_t *node, driver_t *drv);
-bool add_device(driver_t *drv, node_t *node);
+void add_device(driver_t *drv, node_t *node);
 bool start_driver(driver_t *drv);
 
 driver_t * find_driver(driver_list_t *drv_list, const char *drv_name);
+void set_driver_phone(driver_t *driver, ipcarg_t phone);
+void initialize_running_driver(driver_t *driver);
 
 
@@ -260,2 +262,5 @@
 
 #endif
+
+/** @}
+ */
Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision 92413defc319a30e0b83ed8a0996c59ffd9cd882)
+++ uspace/srv/devman/main.c	(revision 67ba3090d4246ace5e0aefc167571850e5b115b1)
@@ -60,30 +60,4 @@
 
 /**
- * 
- * 
- * Driver's mutex must be locked.
- */
-static void pass_devices_to_driver(driver_t *driver)
-{
-	
-
-	
-	
-}
-
-static void init_running_driver(driver_t *driver) 
-{
-	fibril_mutex_lock(&driver->driver_mutex);
-	
-	// pass devices which have been already assigned to the driver to the driver
-	pass_devices_to_driver(driver);	
-	
-	// change driver's state to running
-	driver->state = DRIVER_RUNNING;	
-	
-	fibril_mutex_unlock(&driver->driver_mutex);
-}
-
-/**
  * Register running driver.
  */
@@ -134,8 +108,6 @@
 	}
 	
-	fibril_mutex_lock(&driver->driver_mutex);
-	assert(DRIVER_STARTING == driver->state);
-	driver->phone = IPC_GET_ARG5(call);	
-	fibril_mutex_unlock(&driver->driver_mutex);	
+	// remember driver's phone
+	set_driver_phone(driver, IPC_GET_ARG5(call));
 	
 	printf(NAME ":  the %s driver was successfully registered as running.\n", driver->name);
@@ -160,5 +132,5 @@
 		return;
 		
-	init_running_driver(driver);
+	initialize_running_driver(driver);
 	
 	ipc_callid_t callid;
@@ -251,2 +223,5 @@
 	return 0;
 }
+
+/** @}
+ */