Changeset 79d031b in mainline

Timestamp:

2008-08-12T20:47:16Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c06dbf9

Parents:

4bf40f6

Message:

More complete fat_read().

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -70 +70 @@
 #define FAT_DENTRY_DOT          0x2e
 #define FAT_DENTRY_ERASED       0xe5
+
+#define min(a, b)               ((a) < (b) ? (a) : (b))
 
 static void dentry_name_canonify(fat_dentry_t *d, char *buf)
@@ -713 +715 @@
         off_t pos = (off_t)IPC_GET_ARG3(*request);
         fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index);
+        uint16_t bps = fat_bps_get(dev_handle);
+        size_t bytes;
+
         if (!nodep) {
                 ipc_answer_0(rid, ENOENT);
@@ -728 +733 @@
 
         if (nodep->type == FAT_FILE) {
-                /* TODO */
-                fat_node_put(nodep);
-                ipc_answer_0(callid, ENOTSUP);
-                ipc_answer_0(rid, ENOTSUP);
-                return;
+                block_t *b;
+
+                bytes = min(len, bps - pos % bps);
+                b = fat_block_get(nodep, pos / bps);
+                (void) ipc_data_read_finalize(callid, b->data + pos % bps,
+                    bytes);
+                block_put(b);
         } else {
                 assert(nodep->type == FAT_DIRECTORY);
@@ -743 +750 @@
 
         fat_node_put(nodep);
+        ipc_answer_1(rid, EOK, (ipcarg_t)bytes);
 }