GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

Browse source
This commit is contained in:
Wolfgang Denk 2008-01-09 23:43:10 +01:00
commit 80adb27616
1 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/fat/fat.c
View file

@ -85,15 +85,10 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
/* no signature found */ /* no signature found */
return -1; 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) || \ #if (defined(CONFIG_CMD_IDE) || \
defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_SCSI) || \
defined(CONFIG_CMD_USB) || \ defined(CONFIG_CMD_USB) || \
(defined(CONFIG_MMC) && defined(CONFIG_LPC2292)) || \ defined(CONFIG_MMC) || \
defined(CONFIG_SYSTEMACE) ) defined(CONFIG_SYSTEMACE) )
/* First we assume, there is a MBR */ /* First we assume, there is a MBR */
if (!get_partition_info (dev_desc, part_no, &info)) { if (!get_partition_info (dev_desc, part_no, &info)) {
@ -108,8 +103,9 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
part_no, dev_desc->dev); part_no, dev_desc->dev);
return -1; return -1;
} }
#else #else
if(!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3)) { if (!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3)) {
/* ok, we assume we are on a PBR only */ /* ok, we assume we are on a PBR only */
cur_part = 1; cur_part = 1;
part_offset = 0; part_offset = 0;
@ -124,7 +120,6 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
cur_part = 1; cur_part = 1;
} }
#endif #endif
}
return 0; return 0;
} }