Changeset 00aece0 in mainline for uspace/srv/fs/fat/fat.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

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

uspace/srv/fs/fat/fat.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -46 +47 @@
 #endif
 
-#define min(a, b)               ((a) < (b) ? (a) : (b))
+#define min(a, b)       ((a) < (b) ? (a) : (b))
 
 /*
@@ -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) ? \
+    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 ? \
-                        uint16_t_le2host((bs)->totsec16) : \
-                        uint32_t_le2host(bs->totsec32))
-
-#define BS_BLOCK                0
-#define BS_SIZE                 512
+
+#define TS(bs)          (uint16_t_le2host((bs)->totsec16) ? \
+    uint16_t_le2host((bs)->totsec16) : \
+    uint32_t_le2host(bs->totsec32))
+
+#define BS_BLOCK        0
+#define BS_SIZE         512
 
 typedef struct fat_bs {
@@ -135 +141 @@
 } __attribute__ ((packed)) fat_bs_t;
 
+#define FAT32_FSINFO_SIG1       "RRaA"
+#define FAT32_FSINFO_SIG2       "rrAa"
+#define FAT32_FSINFO_SIG3       "\x00\x00\x55\xaa"
+
+typedef struct {
+        uint8_t sig1[4];
+        uint8_t res1[480];
+        uint8_t sig2[4];
+        uint32_t free_clusters;
+        uint32_t last_allocated_cluster;
+        uint8_t res2[12];
+        uint8_t sig3[4];
+} __attribute__ ((packed)) fat32_fsinfo_t;
+
 typedef enum {
         FAT_INVALID,
@@ -224 +244 @@
 } fat_node_t;
 
+typedef struct {
+        bool lfn_enabled;
+} fat_instance_t;
+
 extern vfs_out_ops_t fat_ops;
 extern libfs_ops_t fat_libfs_ops;