"static" from "do_fat_read" removed

[platform/kernel/u-boot.git] / fs / fat / fat.c

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 29eea45..7f991b2 100644 (file)
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -89,7 +89,8 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
                part_offset=0;
        }
        else {
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI) || \
+    (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_SYSTEMACE)
                disk_partition_t info;
                if(!get_partition_info(dev_desc, part_no, &info)) {
                        part_offset = info.start;
@@ -432,12 +433,13 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
        dir_entry *realdent;
        dir_slot  *slotptr = (dir_slot*) retdent;
        __u8      *nextclust = cluster + mydata->clust_size * SECTOR_SIZE;
-       __u8       counter = slotptr->id & 0xf;
+       __u8       counter = (slotptr->id & ~LAST_LONG_ENTRY_MASK) & 0xff;
        int idx = 0;
 
        while ((__u8*)slotptr < nextclust) {
                if (counter == 0) break;
-               if ((slotptr->id & 0x0f) != counter) return -1;
+               if (((slotptr->id & ~LAST_LONG_ENTRY_MASK) & 0xff) != counter)
+                       return -1;
                slotptr++;
                counter--;
        }
@@ -475,7 +477,7 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
        do {
                slotptr--;
                if (slot2str(slotptr, l_name, &idx)) break;
-       } while (!(slotptr->id & 0x40));
+       } while (!(slotptr->id & LAST_LONG_ENTRY_MASK));
 
        l_name[idx] = '\0';
        if (*l_name == DELETED_FLAG) *l_name = '\0';
@@ -533,10 +535,14 @@ static dir_entry *get_dentfromdir (fsdata * mydata, int startsect,
            char s_name[14], l_name[256];
 
            l_name[0] = '\0';
+           if (dentptr->name[0] == DELETED_FLAG) {
+                   dentptr++;
+                   continue;
+           }
            if ((dentptr->attr & ATTR_VOLUME)) {
 #ifdef CONFIG_SUPPORT_VFAT
                if ((dentptr->attr & ATTR_VFAT) &&
-                   (dentptr->name[0] & 0x40)) {
+                   (dentptr->name[0] & LAST_LONG_ENTRY_MASK)) {
                    prevcksum = ((dir_slot *) dentptr)
                            ->alias_checksum;
                    get_vfatname (mydata, curclust, get_dentfromdir_block,
@@ -712,7 +718,7 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
 
 
 __u8 do_fat_read_block[MAX_CLUSTSIZE];  /* Block buffer */
-static long
+long
 do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
             int dols)
 {
@@ -799,7 +805,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
            if ((dentptr->attr & ATTR_VOLUME)) {
 #ifdef CONFIG_SUPPORT_VFAT
                if ((dentptr->attr & ATTR_VFAT) &&
-                   (dentptr->name[0] & 0x40)) {
+                   (dentptr->name[0] & LAST_LONG_ENTRY_MASK)) {
                    prevcksum = ((dir_slot *) dentptr)->alias_checksum;
                    get_vfatname (mydata, 0, do_fat_read_block, dentptr, l_name);
                    if (dols == LS_ROOT) {
@@ -962,7 +968,8 @@ file_fat_detectfs(void)
                printf("No current device\n");
                return 1;
        }
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI) || \
+    (CONFIG_COMMANDS & CFG_CMD_USB) || (CONFIG_MMC)
        printf("Interface:  ");
        switch(cur_dev->if_type) {
                case IF_TYPE_IDE :      printf("IDE"); break;