leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FAT write: Fix compile errors

Browse Source 
This patch removes compile errors introduced by
commit 9813b750f3
'fs/fat: Fix FAT detection to support non-DOS partition tables'

fat_write.c: In function 'disk_write':
fat_write.c:54: error: 'part_offset' undeclared (first use in this function)
fat_write.c:54: error: (Each undeclared identifier is reported only once
fat_write.c:54: error: for each function it appears in.)
fat_write.c: In function 'do_fat_write':
fat_write.c:950: error: 'part_size' undeclared (first use in this function)

These errors only appear when this code is enabled by
defining CONFIG_FAT_WRITE option.

This patch was originally part of

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/121847

Signed-off-by: Donggeun Kim <dg77.kim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Maximilian Schwerin <mvs@tigris.de>

Fixed patch author and added all needed SoB from the original patch
and also submitter's SoB. Extended commit log.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Donggeun Kim 2012-03-22 04:38:55 +00:00 committed by Anatolij Gustschin
parent 7cb30b13f1
commit 079df7223c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/fat/fat_write.c
View File

@ -41,23 +41,19 @@ static void uppercase(char *str, int len)
}
static int total_sector;
static int disk_write(__u32 startblock, __u32 getsize, __u8 *bufptr)
static int disk_write(__u32 block, __u32 nr_blocks, void *buf)
{
if (cur_dev == NULL)
if (!cur_dev || !cur_dev->block_write)
return -1;
if (startblock + getsize > total_sector) {
if (cur_part_info.start + block + nr_blocks >
cur_part_info.start + total_sector) {
printf("error: overflow occurs\n");
return -1;
}
startblock += part_offset;
if (cur_dev->block_read) {
return cur_dev->block_write(cur_dev->dev, startblock, getsize,
(unsigned long *) bufptr);
}
return -1;
return cur_dev->block_write(cur_dev->dev,
cur_part_info.start + block, nr_blocks, buf);
}
/*
@ -797,7 +793,7 @@ static int check_overflow(fsdata *mydata, __u32 clustnum, unsigned long size)
if (size % mydata->sect_size)
sect_num++;
if (startsect + sect_num > total_sector)
if (startsect + sect_num > cur_part_info.start + total_sector)
return -1;
return 0;
@ -947,7 +943,7 @@ static int do_fat_write(const char *filename, void *buffer,
total_sector = bs.total_sect;
if (total_sector == 0)
total_sector = part_size;
total_sector = cur_part_info.size;
root_cluster = bs.root_cluster;