Changeset 4285f384 in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2025-02-25T20:25:43Z (17 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

d231a54

Message:

Allow physically ejecting CD-ROM using vol eject -s

File:

• uspace/srv/bd/vbd/disk.c (modified) (5 diffs)

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <bd.h>
 #include <bd_srv.h>
 #include <block.h>
@@ -71 +72 @@
 static errno_t vbds_bd_get_block_size(bd_srv_t *, size_t *);
 static errno_t vbds_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t vbds_bd_eject(bd_srv_t *);
 
 static errno_t vbds_bsa_translate(vbds_part_t *, aoff64_t, size_t, aoff64_t *);
@@ -93 +95 @@
         .write_blocks = vbds_bd_write_blocks,
         .get_block_size = vbds_bd_get_block_size,
-        .get_num_blocks = vbds_bd_get_num_blocks
+        .get_num_blocks = vbds_bd_get_num_blocks,
+        .eject = vbds_bd_eject
 };
 
@@ -1070 +1073 @@
 
         return EOK;
+}
+
+static errno_t vbds_bd_eject(bd_srv_t *bd)
+{
+        vbds_part_t *part = bd_srv_part(bd);
+        async_sess_t *sess;
+        bd_t *bdc;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_bd_eject()");
+
+        fibril_rwlock_read_lock(&part->lock);
+
+        sess = loc_service_connect(part->disk->svc_id, INTERFACE_BLOCK, 0);
+        if (sess == NULL) {
+                log_msg(LOG_DEFAULT, LVL_WARN,
+                    "vbds_bd_eject() - failed connect");
+                fibril_rwlock_read_unlock(&part->lock);
+                return EIO;
+        }
+
+        rc = bd_open(sess, &bdc);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN,
+                    "vbds_bd_eject() - failed open");
+                async_hangup(sess);
+                fibril_rwlock_read_unlock(&part->lock);
+                return EIO;
+        }
+
+        rc = bd_eject(bdc);
+
+        bd_close(bdc);
+        async_hangup(sess);
+
+        fibril_rwlock_read_unlock(&part->lock);
+        return rc;
 }