Changes in uspace/srv/devman/driver.c [8300c72:5aa06ad] in mainline

File:

• uspace/srv/devman/driver.c (modified) (6 diffs)

uspace/srv/devman/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -284 +284 @@
         dev->drv = drv;
         dev->passed_to_driver = false;
-        fibril_mutex_lock(&dev->state_lock);
-        dev->state = DEVICE_ATTACHING;
-        fibril_mutex_unlock(&dev->state_lock);
-        fibril_condvar_broadcast(&dev->state_cv);
+        dev->state = DEVICE_NOT_INITIALIZED;
         list_append(&dev->driver_devices, &drv->devices);
 
@@ -634 +631 @@
 void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
-        link_t *link;
-        fun_node_t *fun;
-
         /*
          * We do not expect to have driver's mutex locked as we do not
@@ -670 +664 @@
                 async_wait_for(req, &rc);
         }
-
-        if (rc == EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Device was added. Wait for "
-                    "child functions' devices to stabilize.");
-                fibril_rwlock_read_lock(&tree->rwlock);
-                link = list_first(&dev->functions);
-                while (link != NULL) {
-                        fun = list_get_instance(link, fun_node_t,
-                            dev_functions);
-
-                        if (fun->child != NULL) {
-                                log_msg(LOG_DEFAULT, LVL_DEBUG2, "Wait for "
-                                    "child device %p.", (void *)fun->child);
-                                fun_add_ref(fun);
-                                fibril_rwlock_read_unlock(&tree->rwlock);
-                                dev_wait_stable(fun->child);
-                                fibril_rwlock_read_lock(&tree->rwlock);
-                                fun_del_ref(fun);
-                        }
-
-                        link = list_next(link, &dev->functions);
-                }
-
-                fibril_rwlock_read_unlock(&tree->rwlock);
-                log_msg(LOG_DEFAULT, LVL_DEBUG,
-                    "Finished waiting for children.");
-        }
-
-        fibril_mutex_lock(&dev->state_lock);
 
         switch (rc) {
@@ -712 +677 @@
         }
 
-        fibril_mutex_unlock(&dev->state_lock);
-        fibril_condvar_broadcast(&dev->state_cv);
-
         dev->passed_to_driver = true;
 }
@@ -736 +698 @@
         exch = async_exchange_begin(drv->sess);
         retval = async_req_1_0(exch, DRIVER_DEV_REMOVE, handle);
-        async_exchange_end(exch);
-
-        return retval;
-}
-
-errno_t driver_dev_quiesce(dev_tree_t *tree, dev_node_t *dev)
-{
-        async_exch_t *exch;
-        errno_t retval;
-        driver_t *drv;
-        devman_handle_t handle;
-
-        assert(dev != NULL);
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_quiesce(%p)", dev);
-
-        fibril_rwlock_read_lock(&tree->rwlock);
-        drv = dev->drv;
-        handle = dev->handle;
-        fibril_rwlock_read_unlock(&tree->rwlock);
-
-        exch = async_exchange_begin(drv->sess);
-        retval = async_req_1_0(exch, DRIVER_DEV_QUIESCE, handle);
         async_exchange_end(exch);