Changeset 6a0d4ce2 in mainline

Timestamp:

2015-07-02T21:37:30Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6bc542b

Parents:

1626cd4

Message:

De-duplicate type.

Location:

uspace/srv/bd/vbd

Files:

• disk.c (modified) (2 diffs)
• disk.h (modified) (2 diffs)
• types/vbd.h (modified) (1 diff)
• vbd.c (modified) (2 diffs)

uspace/srv/bd/vbd/disk.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <task.h>
+#include <vbd.h>
 
 #include "disk.h"
@@ -370 +371 @@
 }
 
-int vbds_part_get_info(vbds_part_id_t partid, vbds_part_info_t *pinfo)
+int vbds_part_get_info(vbds_part_id_t partid, vbd_part_info_t *pinfo)
 {
         vbds_part_t *part;

uspace/srv/bd/vbd/disk.h

@@ -40 +40 @@
 #include <loc.h>
 #include "types/vbd.h"
+#include <vbd.h>
 
 extern void vbds_disks_init(void);
@@ -48 +49 @@
 extern int vbds_label_create(service_id_t, label_type_t);
 extern int vbds_label_delete(service_id_t);
-extern int vbds_part_get_info(vbds_part_id_t, vbds_part_info_t *);
+extern int vbds_part_get_info(vbds_part_id_t, vbd_part_info_t *);
 extern int vbds_part_create(service_id_t, vbds_part_id_t *);
 extern int vbds_part_delete(vbds_part_id_t);

uspace/srv/bd/vbd/types/vbd.h

@@ -97 +97 @@
 } vbds_disk_t;
 
-/** Partition info */
-typedef struct {
-        /** Partition index */
-        int index;
-        /** First block */
-        aoff64_t block0;
-        /** Number of blocks */
-        aoff64_t nblocks;
-} vbds_part_info_t;
-
 #endif
 

uspace/srv/bd/vbd/vbd.c

@@ -44 +44 @@
 #include <stdlib.h>
 #include <task.h>
+#include <vbd.h>
 
 #include "disk.h"
@@ -218 +219 @@
 {
         vbds_part_id_t part;
-        vbds_part_info_t pinfo;
+        vbd_part_info_t pinfo;
         int rc;