Changeset 4b6635a7 in mainline for uspace/lib/fdisk/include

Timestamp:

2015-10-12T15:42:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

edebb4a1

Parents:

6a0db524

Message:

Volsrv empty partition detection.

Location:

uspace/lib/fdisk/include

Files:

• fdisk.h (modified) (1 diff)
• types/fdisk.h (modified) (6 diffs)

uspace/lib/fdisk/include/fdisk.h

@@ -71 +71 @@
 extern int fdisk_cap_parse(const char *, fdisk_cap_t *);
 extern int fdisk_ltype_format(label_type_t, char **);
-extern int fdisk_fstype_format(fdisk_fstype_t, char **);
+extern int fdisk_fstype_format(vol_fstype_t, char **);
 extern int fdisk_pkind_format(label_pkind_t, char **);
 

uspace/lib/fdisk/include/types/fdisk.h

@@ -41 +41 @@
 #include <stdint.h>
 #include <types/label.h>
+#include <types/vol.h>
 #include <vbd.h>
 #include <vol.h>
@@ -57 +58 @@
 
 #define CU_LIMIT (cu_ybyte + 1)
-
-/** File system type */
-typedef enum {
-        fdfs_none = 0,
-        fdfs_unknown,
-        fdfs_exfat,
-        fdfs_fat,
-        fdfs_minix,
-        fdfs_ext4
-} fdisk_fstype_t;
-
-/** Highest fstype value + 1 */
-#define FDFS_LIMIT (fdfs_ext4 + 1)
-/** Lowest fstype allowed for creation */
-#define FDFS_CREATE_LO fdfs_exfat
-/** Highest fstype allowed for creation + 1 */
-#define FDFS_CREATE_HI (fdfs_ext4 + 1)
 
 /** Partition capacity */
@@ -143 +127 @@
         /** Partition kind */
         label_pkind_t pkind;
+        /** Partition contents */
+        vol_part_cnt_t pcnt;
         /** File system type */
-        fdisk_fstype_t fstype;
+        vol_fstype_t fstype;
         /** Partition ID */
         vbd_part_id_t part_id;
@@ -153 +139 @@
         /** Number of blocks */
         aoff64_t nblocks;
+        /** Service ID */
+        service_id_t svc_id;
 } fdisk_part_t;
 
@@ -162 +150 @@
         label_pkind_t pkind;
         /** File system type */
-        fdisk_fstype_t fstype;
+        vol_fstype_t fstype;
 } fdisk_part_spec_t;
 
@@ -171 +159 @@
         /** Partition kind */
         label_pkind_t pkind;
+        /** Partition contents */
+        vol_part_cnt_t pcnt;
         /** File system type */
-        fdisk_fstype_t fstype;
+        vol_fstype_t fstype;
 } fdisk_part_info_t;