Merge branch 'for-1.3.2-ver2'

[platform/kernel/u-boot.git] / include / fat.h

diff --git a/include/fat.h b/include/fat.h
index 3f9c5f3..92638d5 100644 (file)
--- a/include/fat.h
+++ b/include/fat.h
@@ -27,6 +27,8 @@
 #ifndef _FAT_H_
 #define _FAT_H_
 
+#include <asm/byteorder.h>
+
 #define CONFIG_SUPPORT_VFAT
 
 #define SECTOR_SIZE FS_BLOCK_SIZE
@@ -43,7 +45,7 @@
 
 #define FATBUFBLOCKS   6
 #define FATBUFSIZE     (FS_BLOCK_SIZE*FATBUFBLOCKS)
-#define FAT12BUFSIZE   ((FATBUFSIZE*3)/2)
+#define FAT12BUFSIZE   ((FATBUFSIZE*2)/3)
 #define FAT16BUFSIZE   (FATBUFSIZE/2)
 #define FAT32BUFSIZE   (FATBUFSIZE/4)
 
@@ -67,6 +69,10 @@
 #define DELETED_FLAG   ((char)0xe5) /* Marks deleted files when in name[0] */
 #define aRING          0x05         /* Used to represent 'å' in name[0] */
 
+/* Indicates that the entry is the last long entry in a set of long
+ * dir entries
+ */
+#define LAST_LONG_ENTRY_MASK   0x40
 
 /* Flags telling whether we should read a file or list a directory */
 #define LS_NO  0
@@ -169,15 +175,19 @@ typedef struct dir_slot {
        __u8    name11_12[4];   /* Last 2 characters in name */
 } dir_slot;
 
-/* Private filesystem parameters */
+/* Private filesystem parameters
+ *
+ * Note: FAT buffer has to be 32 bit aligned
+ * (see FAT32 accesses)
+ */
 typedef struct {
+       __u8    fatbuf[FATBUFSIZE]; /* Current FAT buffer */
        int     fatsize;        /* Size of FAT in bits */
        __u16   fatlength;      /* Length of FAT in sectors */
        __u16   fat_sect;       /* Starting sector of the FAT */
        __u16   rootdir_sect;   /* Start sector of root directory */
        __u16   clust_size;     /* Size of clusters in sectors */
-       __u16   data_begin;     /* The sector of the first cluster */
-       __u8    fatbuf[FATBUFSIZE]; /* Current FAT buffer */
+       short   data_begin;     /* The sector of the first cluster, can be negative */
        int     fatbufnum;      /* Used by get_fatent, init to -1 */
 } fsdata;