Changeset d30e067 in mainline for uspace/lib/device/src

Timestamp:

2025-03-02T20:02:33Z (10 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (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 'upstream/master' into helenraid-para

Location:

uspace/lib/device/src

Files:

• bd.c (modified) (2 diffs)
• bd_srv.c (modified) (3 diffs)
• devman.c (modified) (2 diffs)
• vol.c (modified) (2 diffs)

uspace/lib/device/src/bd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -196 +196 @@
 }
 
+errno_t bd_eject(bd_t *bd)
+{
+        async_exch_t *exch = async_exchange_begin(bd->sess);
+
+        errno_t rc = async_req_0_0(exch, BD_EJECT);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
 static void bd_cb_conn(ipc_call_t *icall, void *arg)
 {

uspace/lib/device/src/bd_srv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -206 +206 @@
 }
 
+static void bd_eject_srv(bd_srv_t *srv, ipc_call_t *call)
+{
+        errno_t rc;
+
+        if (srv->srvs->ops->eject == NULL) {
+                async_answer_0(call, ENOTSUP);
+                return;
+        }
+
+        rc = srv->srvs->ops->eject(srv);
+        async_answer_0(call, rc);
+}
+
 static bd_srv_t *bd_srv_create(bd_srvs_t *srvs)
 {
@@ -276 +289 @@
                         bd_get_num_blocks_srv(srv, &call);
                         break;
+                case BD_EJECT:
+                        bd_eject_srv(srv, &call);
+                        break;
                 default:
                         async_answer_0(&call, EINVAL);

uspace/lib/device/src/devman.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2007 Josef Cejka
- * Copyright (c) 2013 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -343 +343 @@
 }
 
+errno_t devman_drv_fun_wait_stable(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_DRIVER);
+        if (exch == NULL)
+                return ENOMEM;
+
+        errno_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_WAIT_STABLE, funh);
+
+        devman_exchange_end(exch);
+        return retval;
+}
+
 async_sess_t *devman_parent_device_connect(devman_handle_t handle,
     unsigned int flags)

uspace/lib/device/src/vol.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -253 +253 @@
  * @param vol Volume service
  * @param sid Service ID of the partition
- * @return EOK on success or an error code
- */
-errno_t vol_part_eject(vol_t *vol, service_id_t sid)
-{
-        async_exch_t *exch;
-        errno_t retval;
-
-        exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_0(exch, VOL_PART_EJECT, sid);
+ * @param flags Ejection flags
+ * @return EOK on success or an error code
+ */
+errno_t vol_part_eject(vol_t *vol, service_id_t sid, vol_eject_flags_t flags)
+{
+        async_exch_t *exch;
+        errno_t retval;
+
+        exch = async_exchange_begin(vol->sess);
+        retval = async_req_2_0(exch, VOL_PART_EJECT, sid, flags);
         async_exchange_end(exch);