Changeset fc840d9 in mainline for uspace/lib/libfs/libfs.c

Timestamp:

2008-10-27T16:53:38Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7a5cdded

Parents:

04619ba

Message:

Move libfs_blockread(), block_get() and block_put() to libblock.

File:

• uspace/lib/libfs/libfs.c (modified) (2 diffs)

uspace/lib/libfs/libfs.c

@@ -37 +37 @@
 #include "libfs.h" 
 #include "../../srv/vfs/vfs.h"
-#include "../../srv/rd/rd.h"
 #include <errno.h>
 #include <async.h>
@@ -332 +331 @@
 }
 
-/** Read data from a block device.
- *
- * @param phone         Phone to be used to communicate with the device.
- * @param buffer        Communication buffer shared with the device.
- * @param bufpos        Pointer to the first unread valid offset within the
- *                      communication buffer.
- * @param buflen        Pointer to the number of unread bytes that are ready in
- *                      the communication buffer.
- * @param pos           Device position to be read.
- * @param dst           Destination buffer.
- * @param size          Size of the destination buffer.
- * @param block_size    Block size to be used for the transfer.
- *
- * @return              True on success, false on failure.
- */
-bool libfs_blockread(int phone, void *buffer, off_t *bufpos, size_t *buflen,
-    off_t *pos, void *dst, size_t size, size_t block_size)
-{
-        off_t offset = 0;
-        size_t left = size;
-        
-        while (left > 0) {
-                size_t rd;
-                
-                if (*bufpos + left < *buflen)
-                        rd = left;
-                else
-                        rd = *buflen - *bufpos;
-                
-                if (rd > 0) {
-                        /*
-                         * Copy the contents of the communication buffer to the
-                         * destination buffer.
-                         */
-                        memcpy(dst + offset, buffer + *bufpos, rd);
-                        offset += rd;
-                        *bufpos += rd;
-                        *pos += rd;
-                        left -= rd;
-                }
-                
-                if (*bufpos == *buflen) {
-                        /* Refill the communication buffer with a new block. */
-                        ipcarg_t retval;
-                        int rc = async_req_2_1(phone, RD_READ_BLOCK,
-                            *pos / block_size, block_size, &retval);
-                        if ((rc != EOK) || (retval != EOK))
-                                return false;
-                        
-                        *bufpos = 0;
-                        *buflen = block_size;
-                }
-        }
-        
-        return true;
-}
-
 /** @}
  */