Changeset 84876aa4 in mainline for uspace/lib/fdisk/include/fdisk.h

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (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 master into gfx

Mainly to get XCW fixes

File:

• uspace/lib/fdisk/include/fdisk.h (modified) (3 diffs)

uspace/lib/fdisk/include/fdisk.h

@@ -50 +50 @@
 extern errno_t fdisk_dev_info_get_svcname(fdisk_dev_info_t *, char **);
 extern void fdisk_dev_info_get_svcid(fdisk_dev_info_t *, service_id_t *);
-extern errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *, cap_spec_t *);
+extern errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *, capa_spec_t *);
 
 extern errno_t fdisk_dev_open(fdisk_t *, service_id_t, fdisk_dev_t **);
@@ -57 +57 @@
 extern void fdisk_dev_get_flags(fdisk_dev_t *, fdisk_dev_flags_t *);
 extern errno_t fdisk_dev_get_svcname(fdisk_dev_t *, char **);
-extern errno_t fdisk_dev_capacity(fdisk_dev_t *, cap_spec_t *);
+extern errno_t fdisk_dev_capacity(fdisk_dev_t *, capa_spec_t *);
 
 extern errno_t fdisk_label_get_info(fdisk_dev_t *, fdisk_label_info_t *);
@@ -66 +66 @@
 extern fdisk_part_t *fdisk_part_next(fdisk_part_t *);
 extern errno_t fdisk_part_get_info(fdisk_part_t *, fdisk_part_info_t *);
-extern errno_t fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, cap_spec_t *);
-extern errno_t fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, cap_spec_t *);
+extern errno_t fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, capa_spec_t *);
+extern errno_t fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, capa_spec_t *);
 extern errno_t fdisk_part_create(fdisk_dev_t *, fdisk_part_spec_t *,
     fdisk_part_t **);