Changeset f0f8787 in mainline for uspace/lib

Timestamp:

2018-10-04T14:53:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c5429fe

Parents:

1bb43d5

git-author:

Jiri Svoboda <jiri@…> (2018-10-03 21:51:40)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-04 14:53:29)

Message:

Add vol insert subcommand to re-insert a previously ejected volume.

Location:

uspace/lib/c

Files:

• generic/vol.c (modified) (5 diffs)
• include/ipc/vol.h (modified) (1 diff)
• include/vol.h (modified) (1 diff)

uspace/lib/c/generic/vol.c

@@ -196 +196 @@
  * the dummy partition is created), it can take some (unknown) time
  * until it is discovered.
+ *
+ * @param vol Volume service
+ * @param sid Service ID of the partition
+ * @return EOK on success or an error code
  */
 errno_t vol_part_add(vol_t *vol, service_id_t sid)
@@ -212 +216 @@
 }
 
-/** Get partition information. */
+/** Get partition information.
+ *
+ * @param vol Volume service
+ * @param sid Service ID of the partition
+ * @param vinfo Place to sore partition information
+ * @return EOK on success or an error code
+ */
 errno_t vol_part_info(vol_t *vol, service_id_t sid, vol_part_info_t *vinfo)
 {
@@ -236 +246 @@
 }
 
-/** Unmount partition (and possibly eject the media). */
+/** Unmount partition (and possibly eject the media).
+ *
+ * @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)
 {
@@ -254 +269 @@
 /** Erase partition (to the extent where we will consider it not containing
  * a file system.
+ *
+ * @param vol Volume service
+ * @param sid Service ID of the partition
+ * @return EOK on success or an error code
  */
 errno_t vol_part_empty(vol_t *vol, service_id_t sid)
@@ -270 +289 @@
 }
 
-/** Get volume label support. */
+/** Insert volume.
+ *
+ * This will re-mount the volume if it has been ejected previously.
+ *
+ * @param vol Volume service
+ * @param sid Service ID of the partition
+ * @return EOK on success or an error code
+ */
+errno_t vol_part_insert(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_INSERT, sid);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
+}
+
+/** Get volume label support.
+ *
+ * @param vol Volume service
+ * @param fstype File system type
+ * @param vlsupp Place to store volume label support information
+ * @return EOK on success or an error code
+ */
 errno_t vol_part_get_lsupp(vol_t *vol, vol_fstype_t fstype,
     vol_label_supp_t *vlsupp)

uspace/lib/c/include/ipc/vol.h

@@ -45 +45 @@
         VOL_PART_EJECT,
         VOL_PART_EMPTY,
+        VOL_PART_INSERT,
         VOL_PART_LSUPP,
         VOL_PART_MKFS,

uspace/lib/c/include/vol.h

@@ -50 +50 @@
 extern errno_t vol_part_eject(vol_t *, service_id_t);
 extern errno_t vol_part_empty(vol_t *, service_id_t);
+extern errno_t vol_part_insert(vol_t *, service_id_t);
 extern errno_t vol_part_get_lsupp(vol_t *, vol_fstype_t, vol_label_supp_t *);
 extern errno_t vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *,