Merge branch 'warning-cleanup'

[karo-tx-uboot.git] / fs / fat / fat.c

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index c068a842e8f8849f9fef811361dcadc2b2e3916b..2445f1e784d322ec70ff7412db1c60615ada4cc3 100644 (file)
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -31,8 +31,6 @@
 #include <asm/byteorder.h>
 #include <part.h>
 
-#if defined(CONFIG_CMD_FAT)
-
 /*
  * Convert a string to lowercase.
  */
@@ -85,17 +83,13 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
                /* no signature found */
                return -1;
        }
-       if(!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3)) {
-               /* ok, we assume we are on a PBR only */
-               cur_part = 1;
-               part_offset=0;
-       }
-       else {
 #if (defined(CONFIG_CMD_IDE) || \
+     defined(CONFIG_CMD_MG_DISK) || \
+     defined(CONFIG_CMD_SATA) || \
      defined(CONFIG_CMD_SCSI) || \
      defined(CONFIG_CMD_USB) || \
-     (defined(CONFIG_MMC) && defined(CONFIG_LPC2292)) || \
-     defined(CONFIG_SYSTEMACE)          )
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) )
        /* First we assume, there is a MBR */
        if (!get_partition_info (dev_desc, part_no, &info)) {
                part_offset = info.start;
@@ -105,13 +99,15 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
                cur_part = 1;
                part_offset = 0;
        } else {
-               printf ("** Partition %d not valid on device %d **\n", part_no, dev_desc->dev);
+               printf ("** Partition %d not valid on device %d **\n",
+                               part_no, dev_desc->dev);
                return -1;
        }
+
 #else
-       if(!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3)) {
-               /* ok, we assume we are on a PBR only */
-               cur_part = 1;
+       if (!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3)) {
+               /* ok, we assume we are on a PBR only */
+               cur_part = 1;
                part_offset = 0;
                info.start = part_offset;
        } else {
@@ -144,28 +140,6 @@ dirdelim(char *str)
        return -1;
 }
 
-
-/*
- * Match volume_info fs_type strings.
- * Return 0 on match, -1 otherwise.
- */
-static int
-compare_sign(char *str1, char *str2)
-{
-       char *end = str1+SIGNLEN;
-
-       while (str1 != end) {
-               if (*str1 != *str2) {
-                       return -1;
-               }
-               str1++;
-               str2++;
-       }
-
-       return 0;
-}
-
-
 /*
  * Extract zero terminated short name from a directory entry.
  */
@@ -190,7 +164,7 @@ static void get_name (dir_entry *dirent, char *s_name)
        if (*s_name == DELETED_FLAG)
                *s_name = '\0';
        else if (*s_name == aRING)
-               *s_name = 'å';
+               *s_name = DELETED_FLAG;
        downcase (s_name);
 }
 
@@ -356,7 +330,7 @@ get_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
                        newclust = get_fatent(mydata, endclust);
                        if((newclust -1)!=endclust)
                                goto getit;
-                       if (newclust <= 0x0001 || newclust >= 0xfff0) {
+                       if (CHECK_CLUST(newclust, mydata->fatsize)) {
                                FAT_DPRINT("curclust: 0x%x\n", newclust);
                                FAT_DPRINT("Invalid FAT entry\n");
                                return gotsize;
@@ -391,7 +365,7 @@ getit:
                filesize -= actsize;
                buffer += actsize;
                curclust = get_fatent(mydata, endclust);
-               if (curclust <= 0x0001 || curclust >= 0xfff0) {
+               if (CHECK_CLUST(curclust, mydata->fatsize)) {
                        FAT_DPRINT("curclust: 0x%x\n", curclust);
                        FAT_ERROR("Invalid FAT entry\n");
                        return gotsize;
@@ -439,7 +413,8 @@ slot2str(dir_slot *slotptr, char *l_name, int *idx)
  * into 'retdent'
  * Return 0 on success, -1 otherwise.
  */
-__u8    get_vfatname_block[MAX_CLUSTSIZE];
+__attribute__ ((__aligned__(__alignof__(dir_entry))))
+__u8 get_vfatname_block[MAX_CLUSTSIZE];
 static int
 get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
             dir_entry *retdent, char *l_name)
@@ -463,7 +438,7 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
 
                slotptr--;
                curclust = get_fatent(mydata, curclust);
-               if (curclust <= 0x0001 || curclust >= 0xfff0) {
+               if (CHECK_CLUST(curclust, mydata->fatsize)) {
                        FAT_DPRINT("curclust: 0x%x\n", curclust);
                        FAT_ERROR("Invalid FAT entry\n");
                        return -1;
@@ -495,7 +470,7 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
 
        l_name[idx] = '\0';
        if (*l_name == DELETED_FLAG) *l_name = '\0';
-       else if (*l_name == aRING) *l_name = 'å';
+       else if (*l_name == aRING) *l_name = DELETED_FLAG;
        downcase(l_name);
 
        /* Return the real directory entry */
@@ -525,6 +500,7 @@ mkcksum(const char *str)
  * Get the directory entry associated with 'filename' from the directory
  * starting at 'startsect'
  */
+__attribute__ ((__aligned__(__alignof__(dir_entry))))
 __u8 get_dentfromdir_block[MAX_CLUSTSIZE];
 static dir_entry *get_dentfromdir (fsdata * mydata, int startsect,
                                   char *filename, dir_entry * retdent,
@@ -656,7 +632,7 @@ static dir_entry *get_dentfromdir (fsdata * mydata, int startsect,
            return retdent;
        }
        curclust = get_fatent (mydata, curclust);
-       if (curclust <= 0x0001 || curclust >= 0xfff0) {
+       if (CHECK_CLUST(curclust, mydata->fatsize)) {
            FAT_DPRINT ("curclust: 0x%x\n", curclust);
            FAT_ERROR ("Invalid FAT entry\n");
            return NULL;
@@ -707,20 +683,16 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
        }
        memcpy(volinfo, vistart, sizeof(volume_info));
 
-       /* Terminate fs_type string. Writing past the end of vistart
-          is ok - it's just the buffer. */
-       vistart->fs_type[8] = '\0';
-
        if (*fatsize == 32) {
-               if (compare_sign(FAT32_SIGN, vistart->fs_type) == 0) {
+               if (strncmp(FAT32_SIGN, vistart->fs_type, SIGNLEN) == 0) {
                        return 0;
                }
        } else {
-               if (compare_sign(FAT12_SIGN, vistart->fs_type) == 0) {
+               if (strncmp(FAT12_SIGN, vistart->fs_type, SIGNLEN) == 0) {
                        *fatsize = 12;
                        return 0;
                }
-               if (compare_sign(FAT16_SIGN, vistart->fs_type) == 0) {
+               if (strncmp(FAT16_SIGN, vistart->fs_type, SIGNLEN) == 0) {
                        *fatsize = 16;
                        return 0;
                }
@@ -730,8 +702,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
        return -1;
 }
 
-
-__u8 do_fat_read_block[MAX_CLUSTSIZE];  /* Block buffer */
+__attribute__ ((__aligned__(__alignof__(dir_entry))))
+__u8 do_fat_read_block[MAX_CLUSTSIZE];
 long
 do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
             int dols)
@@ -986,12 +958,15 @@ file_fat_detectfs(void)
                return 1;
        }
 #if defined(CONFIG_CMD_IDE) || \
+    defined(CONFIG_CMD_MG_DISK) || \
+    defined(CONFIG_CMD_SATA) || \
     defined(CONFIG_CMD_SCSI) || \
     defined(CONFIG_CMD_USB) || \
-    (CONFIG_MMC)
+    defined(CONFIG_MMC)
        printf("Interface:  ");
        switch(cur_dev->if_type) {
                case IF_TYPE_IDE :      printf("IDE"); break;
+               case IF_TYPE_SATA :     printf("SATA"); break;
                case IF_TYPE_SCSI :     printf("SCSI"); break;
                case IF_TYPE_ATAPI :    printf("ATAPI"); break;
                case IF_TYPE_USB :      printf("USB"); break;
@@ -1028,5 +1003,3 @@ file_fat_read(const char *filename, void *buffer, unsigned long maxsize)
        printf("reading %s\n",filename);
        return do_fat_read(filename, buffer, maxsize, LS_NO);
 }
-
-#endif