Changeset f57ccb5 in mainline for uspace/lib/c

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

Files:

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

uspace/lib/c/generic/uuid.c

@@ -36 +36 @@
 #include <uuid.h>
 #include <stdlib.h>
+#include <str.h>
 
 /** Generate UUID.
@@ -87 +88 @@
 }
 
+/** Parse string UUID.
+ *
+ * If @a endptr is not NULL, it is set to point to the first character
+ * following the UUID. If @a endptr is NULL, the string must not contain
+ * any characters following the UUID, otherwise an error is returned.
+ *
+ * @param str    String beginning with UUID string representation
+ * @param uuid   Place to store UUID
+ * @param endptr Place to store pointer to end of UUID or @c NULL
+ *
+ * @return EOK on success or negative error code
+ */
+int uuid_parse(const char *str, uuid_t *uuid, const char **endptr)
+{
+        int rc;
+        const char *eptr;
+        uint32_t time_low;
+        uint16_t time_mid;
+        uint16_t time_ver;
+        uint16_t clock;
+        uint64_t node;
+        int i;
+
+        rc = str_uint32_t(str, &eptr, 16, false, &time_low);
+        if (rc != EOK || eptr != str + 8 || *eptr != '-')
+                return EINVAL;
+
+        rc = str_uint16_t(str + 9, &eptr, 16, false, &time_mid);
+        if (rc != EOK || eptr != str + 13 || *eptr != '-')
+                return EINVAL;
+
+        rc = str_uint16_t(str + 14, &eptr, 16, false, &time_ver);
+        if (rc != EOK || eptr != str + 18 || *eptr != '-')
+                return EINVAL;
+
+        rc = str_uint16_t(str + 19, &eptr, 16, false, &clock);
+        if (rc != EOK || eptr != str + 23 || *eptr != '-')
+                return EINVAL;
+
+        rc = str_uint64_t(str + 24, &eptr, 16, false, &node);
+        if (rc != EOK || eptr != str + 36 || *eptr != '\0')
+                return EINVAL;
+
+        uuid->b[0] = time_low >> 24;
+        uuid->b[1] = (time_low >> 16) & 0xff;
+        uuid->b[2] = (time_low >> 8) & 0xff;
+        uuid->b[3] = time_low & 0xff;
+
+        uuid->b[4] = time_mid >> 8;
+        uuid->b[5] = time_mid & 0xff;
+
+        uuid->b[6] = time_ver >> 8;
+        uuid->b[7] = time_ver & 0xff;
+
+        uuid->b[8] = clock >> 8;
+        uuid->b[9] = clock & 0xff;
+
+        for (i = 0; i < 6; i++)
+                uuid->b[10 + i] = (node >> 8 * (5 - i)) & 0xff;
+
+        if (endptr != NULL) {
+                *endptr = str + 36;
+        } else {
+                if (*(str + 36) != '\0')
+                        return EINVAL;
+        }
+
+        return EOK;
+}
+
+/** Format UUID into string representation.
+ *
+ * @param uuid UUID
+ * @param rstr Place to store pointer to newly allocated string
+ *
+ * @return EOK on success, ENOMEM if out of memory
+ */
+int uuid_format(uuid_t *uuid, char **rstr)
+{
+        return ENOTSUP;
+}
+
+
 /** @}
  */

uspace/lib/c/generic/vbd.c

@@ -330 +330 @@
 }
 
+/** Suggest partition type based on partition content.
+ *
+ * @param vbd   Virtual Block Device
+ * @param disk  Disk on which the partition will be created
+ * @param pcnt  Partition content
+ * @param ptype Place to store suggested partition type
+ *
+ * @return EOK on success or negative error code
+ */
+int vbd_suggest_ptype(vbd_t *vbd, service_id_t disk, label_pcnt_t pcnt,
+    label_ptype_t *ptype)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        ipc_call_t answer;
+
+        exch = async_exchange_begin(vbd->sess);
+        aid_t req = async_send_2(exch, VBD_SUGGEST_PTYPE, disk, pcnt, &answer);
+        int rc = async_data_read_start(exch, ptype, sizeof(label_ptype_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
+        return EOK;
+}
+
+
 /** @}
  */

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