Changeset b79d450 in mainline for uspace/lib/libblock/libblock.c

Timestamp:

2010-01-27T20:35:49Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (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 mainline changes.

File:

• uspace/lib/libblock/libblock.c (modified) (4 diffs)

uspace/lib/libblock/libblock.c

@@ -87 +87 @@
 static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
 static int get_block_size(int dev_phone, size_t *bsize);
+static int get_num_blocks(int dev_phone, bn_t *nblocks);
 
 static devcon_t *devcon_search(dev_handle_t dev_handle)
@@ -714 +715 @@
 
         memcpy(devcon->comm_area, data, devcon->pblock_size * cnt);
-        rc = read_blocks(devcon, ba, cnt);
+        rc = write_blocks(devcon, ba, cnt);
 
         fibril_mutex_unlock(&devcon->comm_area_lock);
@@ -736 +737 @@
         
         return get_block_size(devcon->dev_phone, bsize);
+}
+
+/** Get number of blocks on device.
+ *
+ * @param dev_handle    Device handle of the block device.
+ * @param nblocks       Output number of blocks.
+ *
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_get_nblocks(dev_handle_t dev_handle, bn_t *nblocks)
+{
+        devcon_t *devcon;
+
+        devcon = devcon_search(dev_handle);
+        assert(devcon);
+        
+        return get_num_blocks(devcon->dev_phone, nblocks);
 }
 
@@ -789 +807 @@
 }
 
+/** Get total number of blocks on block device. */
+static int get_num_blocks(int dev_phone, bn_t *nblocks)
+{
+        ipcarg_t nb_l, nb_h;
+        int rc;
+
+        rc = async_req_0_2(dev_phone, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
+        if (rc == EOK) {
+                *nblocks = (bn_t) MERGE_LOUP32(nb_l, nb_h);
+        }
+
+        return rc;
+}
+
 /** @}
  */