Changeset a61d1fc3 in mainline

Timestamp:

2008-08-07T21:40:27Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c544c5d

Parents:

61bc901

Message:

Pass block size to block_get() in the last argument.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -50 +50 @@
 
 #define BS_BLOCK                0
+#define BS_SIZE                 512
 
 /** Futex protecting the list of cached free FAT nodes. */
@@ -100 +101 @@
 } block_t;
 
-static block_t *block_get(dev_handle_t dev_handle, off_t offset)
+static block_t *block_get(dev_handle_t dev_handle, off_t offset, size_t bs)
 {
         return NULL;    /* TODO */
@@ -144 +145 @@
         unsigned i;
 
-        bb = block_get(dev_handle, BS_BLOCK);
+        bb = block_get(dev_handle, BS_BLOCK, BS_SIZE);
         bps = uint16_t_le2host(FAT_BS(bb)->bps);
         spc = FAT_BS(bb)->spc;
@@ -160 +161 @@
                 /* root directory special case */
                 assert(offset < rds);
-                b = block_get(dev_handle, rscnt + fatcnt * sf + offset);
+                b = block_get(dev_handle, rscnt + fatcnt * sf + offset, bps);
                 return b;
         }
@@ -173 +174 @@
                 fidx = clst % (bps / sizeof(fat_cluster_t));
                 /* read FAT1 */
-                b = block_get(dev_handle, rscnt + fsec);
+                b = block_get(dev_handle, rscnt + fsec, bps);
                 clst = uint16_t_le2host(((fat_cluster_t *)b->data)[fidx]);
                 assert(clst != FAT_CLST_BAD);
@@ -181 +182 @@
 
         b = block_get(dev_handle, ssa + (clst - FAT_CLST_FIRST) * spc +
-            offset % spc);
+            offset % spc, bps);
 
         return b;
@@ -203 +204 @@
         uint16_t bps;
         
-        bb = block_get(dev_handle, BS_BLOCK);
+        bb = block_get(dev_handle, BS_BLOCK, BS_SIZE);
         assert(bb != NULL);
         bps = uint16_t_le2host(FAT_BS(bb)->bps);
@@ -572 +573 @@
 
         /* Read the number of root directory entries. */
-        bb = block_get(dev_handle, BS_BLOCK);
+        bb = block_get(dev_handle, BS_BLOCK, BS_SIZE);
         rde = uint16_t_le2host(FAT_BS(bb)->root_ent_max);
         block_put(bb);