Changeset 375ab5e in mainline for uspace/srv/fs/fat/fat.h

Timestamp:

2011-08-24T20:10:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eb660787

Parents:

7fadb65 (diff), 842a2d2 (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 lp:~romanenko-oleg/helenos/fat.

File:

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

uspace/srv/fs/fat/fat.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -55 +56 @@
 #define RSCNT(bs)       uint16_t_le2host((bs)->rscnt)
 #define FATCNT(bs)      (bs)->fatcnt
-#define SF(bs)          uint16_t_le2host((bs)->sec_per_fat)
+#define SF(bs)          (uint16_t_le2host((bs)->sec_per_fat) !=0 ? \
+    uint16_t_le2host((bs)->sec_per_fat) : \
+    uint32_t_le2host(bs->fat32.sectors_per_fat))
 #define RDE(bs)         uint16_t_le2host((bs)->root_ent_max)
 #define TS(bs)          (uint16_t_le2host((bs)->totsec16) != 0 ? \