Changeset d963742 in mainline

Timestamp:

2011-07-14T11:39:11Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

5a9a1aaf

Parents:

4dd9395

Message:

FAT: replace uint16_t with uint32_t in fat_cluster_walk and _fat_block_get
for better FAT32 support

Location:

uspace/srv/fs/fat

Files:

• fat_fat.c (modified) (2 diffs)
• fat_fat.h (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.c

@@ -82 +82 @@
 int
 fat_cluster_walk(fat_bs_t *bs, devmap_handle_t devmap_handle, fat_cluster_t firstc,
-    fat_cluster_t *lastc, uint16_t *numc, uint16_t max_clusters)
-{
-        uint16_t clusters = 0;
+    fat_cluster_t *lastc, uint32_t *numc, uint32_t max_clusters)
+{
+        uint32_t clusters = 0;
         fat_cluster_t clst = firstc, clst_last1 = FAT_CLST_LAST1(bs);
         fat_cluster_t clst_bad = FAT_CLST_BAD(bs);
@@ -199 +199 @@
     fat_cluster_t fcl, fat_cluster_t *clp, aoff64_t bn, int flags)
 {
-        uint16_t clusters;
-        unsigned max_clusters;
+        uint32_t clusters;
+        uint32_t max_clusters;
         fat_cluster_t c;
         int rc;

uspace/srv/fs/fat/fat_fat.h

@@ -104 +104 @@
 
 #define fat_clusters_get(numc, bs, dh, fc) \
-    fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint16_t) -1)
+    fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint32_t) -1)
 extern int fat_cluster_walk(struct fat_bs *, devmap_handle_t, fat_cluster_t,
-    fat_cluster_t *, uint16_t *, uint16_t);
+    fat_cluster_t *, uint32_t *, uint32_t);
 
 extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *,