Changeset 0ecfc62 in mainline for uspace/lib/c

Timestamp:

2015-10-09T18:11:08Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3a43785

Parents:

372df8f

Message:

Information structures need updating to new model.

Location:

uspace/lib/c

Files:

• generic/vol.c (modified) (1 diff)
• include/types/label.h (modified) (1 diff)
• include/vol.h (modified) (1 diff)

uspace/lib/c/generic/vol.c

@@ -192 +192 @@
 {
         async_exch_t *exch;
-        sysarg_t dcnt, ltype, flags;
-        int retval;
+        sysarg_t retval;
+        ipc_call_t answer;
 
         exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_3(exch, VOL_PART_INFO, sid, &dcnt, &ltype,
-            &flags);
+        aid_t req = async_send_1(exch, VOL_PART_INFO, sid, &answer);
+        int rc = async_data_read_start(exch, vinfo, sizeof(vol_part_info_t));
         async_exchange_end(exch);
 
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
         if (retval != EOK)
                 return EIO;
 
-        vinfo->dcnt = (label_disk_cnt_t)dcnt;
-        vinfo->ltype = (label_type_t)ltype;
-        vinfo->flags = (label_flags_t)flags;
         return EOK;
 }

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

@@ -38 +38 @@
 #include <types/uuid.h>
 
-/** Disk contents */
+/** Partition contents */
 typedef enum {
-        /** Disk is considered empty */
-        dc_empty = 0,
-        /** Disk contains a recognized label */
-        dc_label,
-        /** Disk contains a recognized filesystem */
-        dc_fs,
-        /** Disk contains unrecognized data */
-        dc_unknown
-} label_disk_cnt_t;
+        /** Partition is considered empty */
+        ptc_empty = 0,
+        /** Partition contains a recognized filesystem */
+        ptc_fs,
+        /** Partition contains unrecognized data */
+        ptc_unknown
+} label_part_cnt_t;
 
 /** Disk label type */

uspace/lib/c/include/vol.h

@@ -47 +47 @@
 } vol_t;
 
+typedef enum {
+        /** Partition is empty */
+        vpc_empty,
+        /** Partition contains a recognized filesystem */
+        vpc_fs,
+        /** Partition contains unrecognized data */
+        vpc_unknown
+} vol_part_cnt_t;
+
+/** File system type */
+typedef enum {
+        fs_exfat,
+        fs_fat,
+        fs_minix,
+        fs_ext4
+} vol_fstype_t;
+
 /** Partition information */
 typedef struct {
-        /** Partition contents */
-        label_disk_cnt_t dcnt;
-        /** Label type, if partition contents is label XXX */
-        label_type_t ltype;
-        /** Label flags */
-        label_flags_t flags;
+        /** Partition content type */
+        vol_part_cnt_t pcnt;
+        /** Filesystem type */
+        vol_fstype_t fstype;
 } vol_part_info_t;