projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"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
daa7034
..
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 {
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;
disk_partition_t info;
if(!get_partition_info(dev_desc, part_no, &info)) {
part_offset = info.start;
@@
-534,6
+535,10
@@
static dir_entry *get_dentfromdir (fsdata * mydata, int startsect,
char s_name[14], l_name[256];
l_name[0] = '\0';
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) &&
if ((dentptr->attr & ATTR_VOLUME)) {
#ifdef CONFIG_SUPPORT_VFAT
if ((dentptr->attr & ATTR_VFAT) &&
@@
-713,7
+718,7
@@
read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
__u8 do_fat_read_block[MAX_CLUSTSIZE]; /* Block buffer */
__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)
{
do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
int dols)
{