Changeset 6c4eedf in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2017-09-13T20:14:49Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

120d5bc

Parents:

1d40c93d

Message:

Move capacity specification to libc.

File:

• uspace/lib/fdisk/src/fdisk.c (modified) (10 diffs)

uspace/lib/fdisk/src/fdisk.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <cap.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -218 +219 @@
 }
 
-int fdisk_dev_info_capacity(fdisk_dev_info_t *info, fdisk_cap_t *cap)
+int fdisk_dev_info_capacity(fdisk_dev_info_t *info, cap_spec_t *cap)
 {
         vbd_disk_info_t vinfo;
@@ -227 +228 @@
                 return EIO;
 
-        fdisk_cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
+        cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
         return EOK;
 }
@@ -294 +295 @@
                 dev->ext_part = part;
 
-        fdisk_cap_from_blocks(part->nblocks, dev->dinfo.block_size,
+        cap_from_blocks(part->nblocks, dev->dinfo.block_size,
             &part->capacity);
         part->part_id = partid;
@@ -535 +536 @@
 }
 
-int fdisk_dev_capacity(fdisk_dev_t *dev, fdisk_cap_t *cap)
-{
-        fdisk_cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
+int fdisk_dev_capacity(fdisk_dev_t *dev, cap_spec_t *cap)
+{
+        cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -677 +678 @@
 
 /** Get size of largest free block. */
-int fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, fdisk_cap_t *cap)
+int fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, cap_spec_t *cap)
 {
         int rc;
@@ -696 +697 @@
         }
 
-        fdisk_cap_from_blocks(nb, dev->dinfo.block_size, cap);
+        cap_from_blocks(nb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -702 +703 @@
 /** Get total free space capacity. */
 int fdisk_part_get_tot_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
-    fdisk_cap_t *cap)
+    cap_spec_t *cap)
 {
         fdisk_free_range_t fr;
@@ -724 +725 @@
         } while (fdisk_free_range_next(&fr));
 
-        fdisk_cap_from_blocks(totb, dev->dinfo.block_size, cap);
+        cap_from_blocks(totb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -995 +996 @@
         int rc;
 
-        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_nom, dev->dinfo.block_size,
+        rc = cap_spec_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
             &nom_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_min, dev->dinfo.block_size,
+        rc = cap_spec_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
             &min_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_max, dev->dinfo.block_size,
+        rc = cap_spec_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
             &max_blocks);
         if (rc != EOK)