Changeset 77a194c in mainline for uspace/lib/c/include

Timestamp:

2015-11-04T18:55:46Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (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 new disk partitioning architecture.

Location:

uspace/lib/c/include

Files:

• imath.h (moved) (moved from uspace/app/hdisk/input.h ) (2 diffs)
• ipc/services.h (modified) (1 diff)
• ipc/vbd.h (added)
• ipc/vol.h (added)
• str.h (modified) (1 diff)
• types/label.h (added)
• types/uuid.h (added)
• types/vol.h (moved) (moved from uspace/app/hdisk/common.h ) (3 diffs)
• uuid.h (added)
• vbd.h (added)
• vol.h (moved) (moved from uspace/app/hdisk/func_none.h ) (3 diffs)

uspace/lib/c/include/imath.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012-2013 Dominik Taborsky
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup hdisk
+/** @addtogroup libc
  * @{
  */
 /** @file
+ * @brief Integer math functions
  */
 
-#ifndef __INPUT_H__
-#define __INPUT_H__
+#ifndef LIBC_IMATH_H_
+#define LIBC_IMATH_H_
 
-#include <tinput.h>
+#include <stdint.h>
 
-extern int get_input_line(tinput_t *, char **);
-extern uint8_t get_input_uint8(tinput_t *);
-extern uint32_t get_input_uint32(tinput_t *);
-extern uint64_t get_input_uint64(tinput_t *);
-extern size_t get_input_size_t(tinput_t *);
+extern int ipow10_u64(unsigned, uint64_t *);
+extern unsigned ilog10_u64(uint64_t);
 
 #endif
+
+/**
+ * @}
+ */

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

@@ -59 +59 @@
 #define SERVICE_NAME_UDP      "net/udp"
 #define SERVICE_NAME_TCP      "net/tcp"
+#define SERVICE_NAME_VBD      "vbd"
+#define SERVICE_NAME_VOLSRV   "volsrv"
 
 #endif

uspace/lib/c/include/str.h

@@ -82 +82 @@
 extern int str_cmp(const char *s1, const char *s2);
 extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
+extern int str_casecmp(const char *s1, const char *s2);
+extern int str_lcasecmp(const char *s1, const char *s2, size_t max_len);
 
 extern bool str_test_prefix(const char *s, const char *p);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2012-2013 Dominik Taborsky
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup hdisk
+/** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef __COMMON_H__
-#define __COMMON_H__
+#ifndef LIBC_TYPES_VOL_H_
+#define LIBC_TYPES_VOL_H_
 
-#include <libmbr.h>
-#include <libgpt.h>
+#include <async.h>
 
 typedef enum {
-        LYT_NONE,
-        LYT_MBR,
-        LYT_GPT,
-} layouts_t;
+        /** Partition is empty */
+        vpc_empty,
+        /** Partition contains a recognized filesystem */
+        vpc_fs,
+        /** Partition contains unrecognized data */
+        vpc_unknown
+} vol_part_cnt_t;
 
-typedef union {
-        mbr_label_t *mbr;
-        gpt_label_t *gpt;
-} label_data_t;
+/** File system type */
+typedef enum {
+        fs_exfat,
+        fs_fat,
+        fs_minix,
+        fs_ext4
+} vol_fstype_t;
 
-typedef struct label {
-        layouts_t layout;
-        aoff64_t blocks;
-        service_id_t device;
-        label_data_t data;
-        unsigned int alignment;
-        int (* destroy_label)(struct label *);
-        int (* add_part)(struct label *, tinput_t *);
-        int (* delete_part)(struct label *, tinput_t *);
-        int (* new_label)(struct label *);
-        int (* print_parts)(struct label *);
-        int (* read_parts)(struct label *);
-        int (* write_parts)(struct label *);
-        int (* extra_funcs)(struct label *, tinput_t *);
-} label_t;
+#define VOL_FSTYPE_LIMIT (fs_ext4 + 1)
+#define VOL_FSTYPE_DEFAULT fs_minix
+
+/** Volume service */
+typedef struct vol {
+        /** Volume service session */
+        async_sess_t *sess;
+} vol_t;
+
+/** Partition information */
+typedef struct {
+        /** Partition content type */
+        vol_part_cnt_t pcnt;
+        /** Filesystem type */
+        vol_fstype_t fstype;
+} vol_part_info_t;
 
 #endif
+
+/** @}
+ */

uspace/lib/c/include/vol.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012-2013 Dominik Taborsky
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup hdisk
+/** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef __FUNC_NONE_H__
-#define __FUNC_NONE_H__
+#ifndef LIBC_VOL_H_
+#define LIBC_VOL_H_
 
+#include <async.h>
 #include <loc.h>
-#include <tinput.h>
-#include "common.h"
+#include <stdint.h>
+#include <types/label.h>
+#include <types/vol.h>
 
-extern int construct_none_label(label_t *);
-extern int add_none_part(label_t *, tinput_t *);
-extern int delete_none_part(label_t *, tinput_t *);
-extern int destroy_none_label(label_t *);
-extern int new_none_label(label_t *);
-extern int print_none_parts(label_t *);
-extern int read_none_parts(label_t *);
-extern int write_none_parts(label_t *);
-extern int extra_none_funcs(label_t *, tinput_t *);
+extern int vol_create(vol_t **);
+extern void vol_destroy(vol_t *);
+extern int vol_get_parts(vol_t *, service_id_t **, size_t *);
+extern int vol_part_add(vol_t *, service_id_t);
+extern int vol_part_info(vol_t *, service_id_t, vol_part_info_t *);
+extern int vol_part_empty(vol_t *, service_id_t);
+extern int vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t);
 
 #endif
+
+/** @}
+ */