Changeset d3b2ffa in mainline for uspace/lib

Timestamp:

2018-06-29T15:40:10Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5e904dd

Parents:

1e472ee (diff), 1a9174e (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 volume management improvements (still WIP).

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/io/label.c (added)
• c/generic/vol.c (modified) (2 diffs)
• c/include/io/label.h (added)
• c/include/ipc/vol.h (modified) (1 diff)
• c/include/types/vol.h (modified) (2 diffs)
• c/include/vol.h (modified) (2 diffs)
• fdisk/include/fdisk.h (modified) (2 diffs)
• fdisk/src/fdisk.c (modified) (1 diff)

uspace/lib/c/Makefile

@@ -112 +112 @@
         generic/io/log.c \
         generic/io/logctl.c \
+        generic/io/label.c \
         generic/io/kio.c \
         generic/io/klog.c \

uspace/lib/c/generic/vol.c

@@ -235 +235 @@
 }
 
+/** Unmount partition (and possibly eject the media). */
+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);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
+}
+
 /** Erase partition (to the extent where we will consider it not containing
  * a file system.
@@ -304 +320 @@
 }
 
+/** Format file system type as string.
+ *
+ * @param fstype File system type
+ * @param rstr Place to store pointer to newly allocated string
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t vol_fstype_format(vol_fstype_t fstype, char **rstr)
+{
+        const char *sfstype;
+        char *s;
+
+        sfstype = NULL;
+        switch (fstype) {
+        case fs_exfat:
+                sfstype = "ExFAT";
+                break;
+        case fs_fat:
+                sfstype = "FAT";
+                break;
+        case fs_minix:
+                sfstype = "MINIX";
+                break;
+        case fs_ext4:
+                sfstype = "Ext4";
+                break;
+        case fs_cdfs:
+                sfstype = "ISO 9660";
+                break;
+        }
+
+        s = str_dup(sfstype);
+        if (s == NULL)
+                return ENOMEM;
+
+        *rstr = s;
+        return EOK;
+}
+
+/** Format partition content / file system type as string.
+ *
+ * @param pcnt Partition content
+ * @param fstype File system type
+ * @param rstr Place to store pointer to newly allocated string
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t vol_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
+    char **rstr)
+{
+        int rc;
+        char *s = NULL;
+
+        switch (pcnt) {
+        case vpc_empty:
+                s = str_dup("Empty");
+                if (s == NULL)
+                        return ENOMEM;
+                break;
+        case vpc_fs:
+                rc = vol_fstype_format(fstype, &s);
+                if (rc != EOK)
+                        return ENOMEM;
+                break;
+        case vpc_unknown:
+                s = str_dup("Unknown");
+                if (s == NULL)
+                        return ENOMEM;
+                break;
+        }
+
+        assert(s != NULL);
+        *rstr = s;
+        return EOK;
+}
+
 /** @}
  */

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

@@ -42 +42 @@
         VOL_PART_ADD,
         VOL_PART_INFO,
+        VOL_PART_EJECT,
         VOL_PART_EMPTY,
         VOL_PART_LSUPP,
-        VOL_PART_MKFS,
+        VOL_PART_MKFS
 } vol_request_t;
 

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

@@ -37 +37 @@
 
 #include <async.h>
+#include <ipc/vfs.h>
 #include <ipc/vol.h>
 #include <stdbool.h>
@@ -75 +76 @@
         /** Volume label */
         char label[VOL_LABEL_MAXLEN + 1];
+        /** Current mount point */
+        char cur_mp[MAX_PATH_LEN + 1]; /* XXX too big */
+        /** Current mount point is automatic */
+        bool cur_mp_auto;
 } vol_part_info_t;
 

uspace/lib/c/include/vol.h

@@ -37 +37 @@
 
 #include <async.h>
+#include <errno.h>
 #include <loc.h>
 #include <stdint.h>
@@ -47 +48 @@
 extern errno_t vol_part_add(vol_t *, service_id_t);
 extern errno_t vol_part_info(vol_t *, service_id_t, vol_part_info_t *);
+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_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 *);
+
+extern errno_t vol_fstype_format(vol_fstype_t, char **);
+extern errno_t vol_pcnt_fs_format(vol_part_cnt_t, vol_fstype_t, char **);
 
 #endif

uspace/lib/fdisk/include/fdisk.h

@@ -37 +37 @@
 #define LIBFDISK_FDISK_H_
 
+#include <errno.h>
 #include <loc.h>
 #include <types/fdisk.h>
@@ -72 +73 @@
 extern void fdisk_pspec_init(fdisk_part_spec_t *);
 
-extern errno_t fdisk_ltype_format(label_type_t, char **);
-extern errno_t fdisk_fstype_format(vol_fstype_t, char **);
-extern errno_t fdisk_pkind_format(label_pkind_t, char **);
-
 extern errno_t fdisk_get_vollabel_support(fdisk_dev_t *, vol_fstype_t,
     vol_label_supp_t *);

uspace/lib/fdisk/src/fdisk.c

@@ -813 +813 @@
 }
 
-errno_t fdisk_ltype_format(label_type_t ltype, char **rstr)
-{
-        const char *sltype;
-        char *s;
-
-        sltype = NULL;
-        switch (ltype) {
-        case lt_none:
-                sltype = "None";
-                break;
-        case lt_mbr:
-                sltype = "MBR";
-                break;
-        case lt_gpt:
-                sltype = "GPT";
-                break;
-        }
-
-        s = str_dup(sltype);
-        if (s == NULL)
-                return ENOMEM;
-
-        *rstr = s;
-        return EOK;
-}
-
-errno_t fdisk_fstype_format(vol_fstype_t fstype, char **rstr)
-{
-        const char *sfstype;
-        char *s;
-
-        sfstype = NULL;
-        switch (fstype) {
-        case fs_exfat:
-                sfstype = "ExFAT";
-                break;
-        case fs_fat:
-                sfstype = "FAT";
-                break;
-        case fs_minix:
-                sfstype = "MINIX";
-                break;
-        case fs_ext4:
-                sfstype = "Ext4";
-                break;
-        case fs_cdfs:
-                sfstype = "ISO 9660";
-                break;
-        }
-
-        s = str_dup(sfstype);
-        if (s == NULL)
-                return ENOMEM;
-
-        *rstr = s;
-        return EOK;
-}
-
-errno_t fdisk_pkind_format(label_pkind_t pkind, char **rstr)
-{
-        const char *spkind;
-        char *s;
-
-        spkind = NULL;
-        switch (pkind) {
-        case lpk_primary:
-                spkind = "Primary";
-                break;
-        case lpk_extended:
-                spkind = "Extended";
-                break;
-        case lpk_logical:
-                spkind = "Logical";
-                break;
-        }
-
-        s = str_dup(spkind);
-        if (s == NULL)
-                return ENOMEM;
-
-        *rstr = s;
-        return EOK;
-}
-
 /** Get free partition index. */
 static errno_t fdisk_part_get_free_idx(fdisk_dev_t *dev, int *rindex)