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

Timestamp:

2009-08-31T21:55:50Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7d01790

Parents:

cfa8738 (diff), 00b1d20e (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 MBR partition driver.

File:

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

uspace/lib/libblock/libblock.c

@@ -86 +86 @@
 static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
 static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
-static size_t get_block_size(int dev_phone, size_t *bsize);
+static int get_block_size(int dev_phone, size_t *bsize);
 
 static devcon_t *devcon_search(dev_handle_t dev_handle)
@@ -652 +652 @@
 }
 
+/** Read blocks directly from device (bypass cache).
+ *
+ * @param dev_handle    Device handle of the block device.
+ * @param ba            Address of first block.
+ * @param cnt           Number of blocks.
+ * @param src           Buffer for storing the data.
+ *
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_read_direct(dev_handle_t dev_handle, bn_t ba, size_t cnt, void *buf)
+{
+        devcon_t *devcon;
+        int rc;
+
+        devcon = devcon_search(dev_handle);
+        assert(devcon);
+        
+        fibril_mutex_lock(&devcon->comm_area_lock);
+
+        rc = read_blocks(devcon, ba, cnt);
+        if (rc == EOK)
+                memcpy(buf, devcon->comm_area, devcon->pblock_size * cnt);
+
+        fibril_mutex_unlock(&devcon->comm_area_lock);
+
+        return rc;
+}
+
+/** Write blocks directly to device (bypass cache).
+ *
+ * @param dev_handle    Device handle of the block device.
+ * @param ba            Address of first block.
+ * @param cnt           Number of blocks.
+ * @param src           The data to be written.
+ *
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_write_direct(dev_handle_t dev_handle, bn_t ba, size_t cnt,
+    const void *data)
+{
+        devcon_t *devcon;
+        int rc;
+
+        devcon = devcon_search(dev_handle);
+        assert(devcon);
+        
+        fibril_mutex_lock(&devcon->comm_area_lock);
+
+        memcpy(devcon->comm_area, data, devcon->pblock_size * cnt);
+        rc = read_blocks(devcon, ba, cnt);
+
+        fibril_mutex_unlock(&devcon->comm_area_lock);
+
+        return rc;
+}
+
+/** Get device block size.
+ *
+ * @param dev_handle    Device handle of the block device.
+ * @param bsize         Output block size.
+ *
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_get_bsize(dev_handle_t dev_handle, size_t *bsize)
+{
+        devcon_t *devcon;
+
+        devcon = devcon_search(dev_handle);
+        assert(devcon);
+        
+        return get_block_size(devcon->dev_phone, bsize);
+}
+
 /** Read blocks from block device.
  *
@@ -691 +764 @@
 
 /** Get block size used by the device. */
-static size_t get_block_size(int dev_phone, size_t *bsize)
+static int get_block_size(int dev_phone, size_t *bsize)
 {
         ipcarg_t bs;