Changeset 25e963a in mainline

Timestamp:

2010-02-06T10:49:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

696979ce, f27ada7

Parents:

a281fc82 (diff), 3f93cdbe (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 from the file system branch.

File:

• uspace/srv/fs/fat/fat_fat.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_fat.c

@@ -361 +361 @@
         uint16_t rscnt;
         uint16_t sf;
-        uint16_t ts;
+        uint32_t ts;
         unsigned rde;
         unsigned rds;
@@ -379 +379 @@
         sf = uint16_t_le2host(bs->sec_per_fat);
         rde = uint16_t_le2host(bs->root_ent_max);
-        ts = uint16_t_le2host(bs->totsec16);
+        ts = (uint32_t) uint16_t_le2host(bs->totsec16);
+        if (ts == 0)
+                ts = uint32_t_le2host(bs->totsec32);
 
         rds = (sizeof(fat_dentry_t) * rde) / bps;