Changes in uspace/lib/drv/generic/driver.c [ca48672:fafb8e5] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (9 diffs)

uspace/lib/drv/generic/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -237 +237 @@
 }
 
-static void driver_dev_quiesce(ipc_call_t *icall)
-{
-        devman_handle_t devh = ipc_get_arg1(icall);
-        ddf_fun_t *fun;
-        link_t *link;
-
-        fibril_mutex_lock(&devices_mutex);
-        ddf_dev_t *dev = driver_get_device(devh);
-        if (dev != NULL)
-                dev_add_ref(dev);
-        fibril_mutex_unlock(&devices_mutex);
-
-        if (dev == NULL) {
-                async_answer_0(icall, ENOENT);
-                return;
-        }
-
-        errno_t rc;
-
-        if (driver->driver_ops->dev_quiesce != NULL) {
-                rc = driver->driver_ops->dev_quiesce(dev);
-        } else {
-                /*
-                 * If the driver does not implement quiesce, we will
-                 * simply request all subordinate functions to quiesce.
-                 */
-                fibril_mutex_lock(&functions_mutex);
-                link = list_first(&functions);
-                while (link != NULL) {
-                        fun = list_get_instance(link, ddf_fun_t, link);
-                        if (fun->dev == dev)
-                                ddf_fun_quiesce(fun);
-                        link = list_next(link, &functions);
-                }
-                fibril_mutex_unlock(&functions_mutex);
-                rc = EOK;
-        }
-
-        dev_del_ref(dev);
-        async_answer_0(icall, rc);
-}
-
 static void driver_fun_online(ipc_call_t *icall)
 {
@@ -399 +357 @@
                 case DRIVER_DEV_GONE:
                         driver_dev_gone(&call);
-                        break;
-                case DRIVER_DEV_QUIESCE:
-                        driver_dev_quiesce(&call);
                         break;
                 case DRIVER_FUN_ONLINE:
@@ -948 +903 @@
 }
 
-/** Quiesce function.
- *
- * @param fun Function to quiesce
- *
- * @return EOK on success or an error code
- *
- */
-errno_t ddf_fun_quiesce(ddf_fun_t *fun)
-{
-        assert(fun->bound == true);
-
-        errno_t res = devman_drv_fun_quiesce(fun->handle);
-        if (res != EOK)
-                return res;
-
-        return EOK;
-}
-
 /** Add single match ID to inner function.
  *
@@ -1034 +971 @@
 }
 
-/** Wait for function to enter stable state.
- *
- * @param fun Function
- * @return EOK on success or an error code
- */
-errno_t ddf_fun_wait_stable(ddf_fun_t *fun)
-{
-        return devman_drv_fun_wait_stable(fun->handle);
-}
-
 errno_t ddf_driver_main(const driver_t *drv)
 {
-        port_id_t drv_port;
-        port_id_t devman_port;
-
         /*
          * Remember the driver structure - driver_ops will be called by generic
@@ -1059 +983 @@
          * incoming connections.
          */
-        errno_t rc = async_create_port(INTERFACE_DDF_DRIVER,
-            driver_connection_driver, NULL, &drv_port);
+        port_id_t port;
+        errno_t rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
+            NULL, &port);
         if (rc != EOK) {
                 printf("Error: Failed to create driver port.\n");
@@ -1067 +992 @@
 
         rc = async_create_port(INTERFACE_DDF_DEVMAN, driver_connection_devman,
-            NULL, &devman_port);
+            NULL, &port);
         if (rc != EOK) {
                 printf("Error: Failed to create devman port.\n");
-                async_port_destroy(drv_port);
                 return rc;
         }
@@ -1081 +1005 @@
                     "(%s).\n", (rc == EEXIST) ? "driver already started" :
                     str_error(rc));
-                async_port_destroy(devman_port);
-                async_port_destroy(drv_port);
+
                 return rc;
         }
@@ -1090 +1013 @@
         if (rc != EOK) {
                 printf("Error: Failed returning task value.\n");
-                // XXX devman_driver_unregister
-                async_port_destroy(devman_port);
-                async_port_destroy(drv_port);
                 return rc;
         }