Changeset deacc58d in mainline for uspace/lib/label/include/types/liblabel.h

Timestamp:

2017-06-20T17:34:02Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

80da8f70

Parents:

63e27ef

Message:

Break liblabel dependency on libblock.

File:

• uspace/lib/label/include/types/liblabel.h (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <types/label.h>
 #include <offset.h>
+#include <stddef.h>
 #include <vol.h>
 #include <uuid.h>
@@ -48 +49 @@
 typedef struct label_part_info label_part_info_t;
 typedef struct label_part_spec label_part_spec_t;
+typedef struct label_bd label_bd_t;
+typedef struct label_bd_ops label_bd_ops_t;
 
 /** Ops for individual label type */
 typedef struct {
-        int (*open)(service_id_t, label_t **);
-        int (*create)(service_id_t, label_t **);
+        int (*open)(label_bd_t *, label_t **);
+        int (*create)(label_bd_t *, label_t **);
         void (*close)(label_t *);
         int (*destroy)(label_t *);
@@ -138 +141 @@
 } label_mbr_t;
 
+/** Block device operations */
+struct label_bd_ops {
+        /** Get block size */
+        int (*get_bsize)(void *, size_t *);
+        /** Get number of blocks */
+        int (*get_nblocks)(void *, aoff64_t *);
+        /** Read blocks */
+        int (*read)(void *, aoff64_t, size_t, void *);
+        /** Write blocks */
+        int (*write)(void *, aoff64_t, size_t, const void *);
+};
+
+/** Block device */
+struct label_bd {
+        /** Ops structure */
+        label_bd_ops_t *ops;
+        /** Argument */
+        void *arg;
+};
+
 /** Label instance */
 struct label {
@@ -144 +167 @@
         /** Label type */
         label_type_t ltype;
-        /** Block device service ID */
-        service_id_t svc_id;
+        /** Block device */
+        label_bd_t bd;
         /** Partitions */
         list_t parts; /* of label_part_t */