Changeset f57ccb5 in mainline for uspace/lib/c/include

Timestamp:

2015-08-11T16:03:59Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0bde8523

Parents:

1b23e33

Message:

Set partition type based on selected filesystem type.

Location:

uspace/lib/c/include

Files:

• ipc/vbd.h (modified) (1 diff)
• types/label.h (modified) (2 diffs)
• types/uuid.h (added)
• uuid.h (modified) (1 diff)
• vbd.h (modified) (2 diffs)

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

@@ -46 +46 @@
         VBD_PART_CREATE,
         VBD_PART_DELETE,
+        VBD_SUGGEST_PTYPE
 } vbd_request_t;
 

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

@@ -36 +36 @@
 #define LIBC_TYPES_LABEL_H_
 
+#include <types/uuid.h>
+
 /** Disk contents */
 typedef enum {
@@ -72 +74 @@
         /** Label supports extended (and logical) partitions */
         lf_ext_supp = 0x1,
+        /** Partition type is in UUID format (otherwise in small number format) */
+        lf_ptype_uuid = 0x2,
         /** Currently it is possible to create a primary partition */
-        lf_can_create_pri = 0x2,
+        lf_can_create_pri = 0x4,
         /** Currently it is possible to create an extended partition */
-        lf_can_create_ext = 0x4,
+        lf_can_create_ext = 0x8,
         /** Currrently it is possible to create a logical partition */
-        lf_can_create_log = 0x8
+        lf_can_create_log = 0x10
 } label_flags_t;
+
+/** Partition type format */
+typedef enum {
+        /** Small number */
+        lptf_num,
+        /** UUID */
+        lptf_uuid
+} label_pt_fmt;
+
+/** Partition type */
+typedef struct {
+        /** Type format */
+        label_pt_fmt fmt;
+        /** Depending on @c fmt */
+        union {
+                /* Small number */
+                uint8_t num;
+                /** UUID */
+                uuid_t uuid;
+        } t;
+} label_ptype_t;
+
+/** Partition content (used to get partition type suggestion) */
+typedef enum {
+        /** ExFAT */
+        lpc_exfat,
+        /** Ext4 */
+        lpc_ext4,
+        /** FAT12 or FAT16 */
+        lpc_fat12_16,
+        /** FAT32 */
+        lpc_fat32,
+        /** Minix file system */
+        lpc_minix
+} label_pcnt_t;
 
 #endif

uspace/lib/c/include/uuid.h

@@ -37 +37 @@
 
 #include <stdint.h>
-
-enum {
-        uuid_bytes = 16
-};
-
-/** Universally Unique Identifier */
-typedef struct {
-        uint8_t b[uuid_bytes];
-} uuid_t;
+#include <types/uuid.h>
 
 extern int uuid_generate(uuid_t *);
 extern void uuid_encode(uuid_t *, uint8_t *);
 extern void uuid_decode(uint8_t *, uuid_t *);
+extern int uuid_parse(const char *, uuid_t *, const char **);
+extern int uuid_format(uuid_t *, char **);
 
 #endif

uspace/lib/c/include/vbd.h

@@ -74 +74 @@
         label_pkind_t pkind;
         /** Partition type */
-        uint64_t ptype;
+        label_ptype_t ptype;
 } vbd_part_spec_t;
 
@@ -105 +105 @@
 extern int vbd_part_delete(vbd_t *, vbd_part_id_t);
 extern void vbd_pspec_init(vbd_part_spec_t *);
+extern int vbd_suggest_ptype(vbd_t *, service_id_t, label_pcnt_t,
+    label_ptype_t *);
 
 #endif