Changeset 9c2c7d2 in mainline for uspace/lib/c

Timestamp:

2017-07-06T15:52:15Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5cd1eb9a

Parents:

d858a660

Message:

Fdisk should be able to set volume label for newly created partitions.

Location:

uspace/lib/c

Files:

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

uspace/lib/c/generic/vol.c

@@ -39 +39 @@
 #include <loc.h>
 #include <stdlib.h>
+#include <str.h>
 #include <vol.h>
 
@@ -251 +252 @@
 }
 
+/** Get volume label support. */
+int vol_part_get_lsupp(vol_t *vol, vol_fstype_t fstype,
+    vol_label_supp_t *vlsupp)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        ipc_call_t answer;
+
+        exch = async_exchange_begin(vol->sess);
+        aid_t req = async_send_1(exch, VOL_PART_LSUPP, fstype, &answer);
+        int rc = async_data_read_start(exch, vlsupp, sizeof(vol_label_supp_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
+        return EOK;
+}
+
 /** Create file system. */
-int vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype)
-{
-        async_exch_t *exch;
-        int retval;
-
-        exch = async_exchange_begin(vol->sess);
-        retval = async_req_2_0(exch, VOL_PART_MKFS, sid, fstype);
-        async_exchange_end(exch);
+int vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype,
+    const char *label)
+{
+        async_exch_t *exch;
+        ipc_call_t answer;
+        sysarg_t retval;
+
+        exch = async_exchange_begin(vol->sess);
+        aid_t req = async_send_2(exch, VOL_PART_MKFS, sid, fstype, &answer);
+        retval = async_data_write_start(exch, label, str_size(label));
+        async_exchange_end(exch);
+
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
 
         if (retval != EOK)

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

@@ -43 +43 @@
         VOL_PART_INFO,
         VOL_PART_EMPTY,
-        VOL_PART_MKFS
+        VOL_PART_LSUPP,
+        VOL_PART_MKFS,
 } vol_request_t;
 

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

@@ -38 +38 @@
 #include <async.h>
 #include <ipc/vol.h>
+#include <stdbool.h>
 
 typedef enum {
@@ -76 +77 @@
 } vol_part_info_t;
 
+/** Volume label support */
+typedef struct {
+        /** Volume labels are supported */
+        bool supported;
+} vol_label_supp_t;
+
 #endif
 

uspace/lib/c/include/vol.h

@@ -48 +48 @@
 extern int vol_part_info(vol_t *, service_id_t, vol_part_info_t *);
 extern int vol_part_empty(vol_t *, service_id_t);
-extern int vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t);
+extern int vol_part_get_lsupp(vol_t *, vol_fstype_t, vol_label_supp_t *);
+extern int vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *);
 
 #endif