Changeset fc22069 in mainline for uspace/lib

Timestamp:

2015-08-22T05:12:30Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

78bb04b

Parents:

d9e68d0

Message:

block devices use the same interface, therefore the API of libblock should not expose the implementation details

Location:

uspace/lib

Files:

• bithenge/src/helenos/block.c (modified) (1 diff)
• block/block.c (modified) (1 diff)
• block/block.h (modified) (1 diff)
• ext4/libext4_filesystem.c (modified) (1 diff)
• gpt/libgpt.c (modified) (4 diffs)
• mbr/libmbr.c (modified) (5 diffs)

uspace/lib/bithenge/src/helenos/block.c

@@ -102 +102 @@
         // Initialize libblock
         int rc;
-        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+        rc = block_init(service_id, 2048);
         if (rc != EOK)
                 return rc;

uspace/lib/block/block.c

@@ -144 +144 @@
 }
 
-int block_init(exch_mgmt_t mgmt, service_id_t service_id,
-    size_t comm_size)
+int block_init(service_id_t service_id, size_t comm_size)
 {
         bd_t *bd;
 
-        async_sess_t *sess = loc_service_connect(mgmt, service_id,
+        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, service_id,
             IPC_FLAG_BLOCKING);
         if (!sess) {

uspace/lib/block/block.h

@@ -99 +99 @@
 };
 
-extern int block_init(exch_mgmt_t, service_id_t, size_t);
+extern int block_init(service_id_t, size_t);
 extern void block_fini(service_id_t);
 

uspace/lib/ext4/libext4_filesystem.c

@@ -61 +61 @@
 
         /* Initialize block library (4096 is size of communication channel) */
-        rc = block_init(EXCHANGE_SERIALIZE, fs->device, 4096);
+        rc = block_init(fs->device, 4096);
         if (rc != EOK)
                 goto err;

uspace/lib/gpt/libgpt.c

@@ -137 +137 @@
 int gpt_read_header(gpt_label_t *label, service_id_t dev_handle)
 {
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -191 +191 @@
 {
         /* The comm_size argument (the last one) is ignored */
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
+        int rc = block_init(dev_handle, 4096);
         if ((rc != EOK) && (rc != EEXIST))
                 return rc;
@@ -288 +288 @@
         }
         
-        int rc = block_init(EXCHANGE_SERIALIZE, label->device,
-            sizeof(gpt_entry_t));
+        int rc = block_init(label->device, sizeof(gpt_entry_t));
         if (rc != EOK) {
                 gpt_free_partitions(label->parts);
@@ -348 +347 @@
 {
         /* comm_size of 4096 is ignored */
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
+        int rc = block_init(dev_handle, 4096);
         if ((rc != EOK) && (rc != EEXIST))
                 return rc;

uspace/lib/mbr/libmbr.c

@@ -109 +109 @@
         }
         
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -133 +133 @@
 int mbr_write_mbr(mbr_label_t *label, service_id_t dev_handle)
 {
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -227 +227 @@
                 label->mbr = mbr_alloc_mbr();
         
-        int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        int rc = block_init(dev_handle, 512);
         if (rc != EOK)
                 return rc;
@@ -413 +413 @@
 mbr_err_val mbr_add_partition(mbr_label_t *label, mbr_part_t *part)
 {
-        int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
+        int rc = block_init(label->device, 512);
         if ((rc != EOK) && (rc != EEXIST))
                 return ERR_LIBBLOCK;
@@ -622 +622 @@
         uint32_t addr = base;
         
-        int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
+        int rc = block_init(label->device, 512);
         if (rc != EOK)
                 goto end;