Changeset d3b2ffa in mainline for uspace/lib/c/include

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/c/include

Files:

• io/label.h (added)
• ipc/vol.h (modified) (1 diff)
• types/vol.h (modified) (2 diffs)
• vol.h (modified) (2 diffs)

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