Changeset 234e39e in mainline for uspace/lib

Timestamp:

2010-01-09T22:12:40Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4702798

Parents:

40d4c1d (diff), 9245413 (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 mkfile and mkfat.

Location:

uspace/lib

Files:

• libblock/libblock.c (modified) (4 diffs)
• libblock/libblock.h (modified) (2 diffs)
• libc/generic/io/io.c (modified) (1 diff)
• libc/include/ipc/bd.h (modified) (1 diff)
• libc/include/sys/types.h (modified) (1 diff)

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;
+}
+
 /** @}
  */

uspace/lib/libblock/libblock.h

@@ -60 +60 @@
 #define BLOCK_FLAGS_NOREAD      1
 
-typedef uint64_t bn_t;  /**< Block number type. */
-
 typedef struct block {
         /** Mutex protecting the reference count. */
@@ -110 +108 @@
 
 extern int block_get_bsize(dev_handle_t, size_t *);
+extern int block_get_nblocks(dev_handle_t, bn_t *);
 extern int block_read_direct(dev_handle_t, bn_t, size_t, void *);
 extern int block_write_direct(dev_handle_t, bn_t, size_t, const void *);

uspace/lib/libc/generic/io/io.c

@@ -554 +554 @@
 }
 
+int ftell(FILE *stream)
+{
+        off_t rc = lseek(stream->fd, 0, SEEK_CUR);
+        if (rc == (off_t) (-1)) {
+                /* errno has been set by lseek. */
+                return -1;
+        }
+
+        return rc;
+}
+
 void rewind(FILE *stream)
 {

uspace/lib/libc/include/ipc/bd.h

@@ -40 +40 @@
 typedef enum {
         BD_GET_BLOCK_SIZE = IPC_FIRST_USER_METHOD,
+        BD_GET_NUM_BLOCKS,
         BD_READ_BLOCKS,
         BD_WRITE_BLOCKS

uspace/lib/libc/include/sys/types.h

@@ -40 +40 @@
 typedef long off_t;
 typedef int mode_t;
+typedef uint64_t bn_t;  /**< Block number type. */
 
 typedef int32_t wchar_t;