projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sandbox/fs: Free memory allocated by os_dirent_ls
[oweals/u-boot.git]
/
fs
/
fat
/
fat.c
diff --git
a/fs/fat/fat.c
b/fs/fat/fat.c
index 472a63e8bb0af7fb47f9467b40a781d1744a1ecd..df9f2b56562aafae900974fb85ac236d3d8a2975 100644
(file)
--- a/
fs/fat/fat.c
+++ b/
fs/fat/fat.c
@@
-10,6
+10,7
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <blk.h>
#include <config.h>
#include <exports.h>
#include <fat.h>
#include <config.h>
#include <exports.h>
#include <fat.h>
@@
-37,7
+38,7
@@
static void downcase(char *str)
}
}
}
}
-static
block_dev_desc_t
*cur_dev;
+static
struct blk_desc
*cur_dev;
static disk_partition_t cur_part_info;
#define DOS_BOOT_MAGIC_OFFSET 0x1fe
static disk_partition_t cur_part_info;
#define DOS_BOOT_MAGIC_OFFSET 0x1fe
@@
-48,11
+49,10
@@
static int disk_read(__u32 block, __u32 nr_blocks, void *buf)
{
ulong ret;
{
ulong ret;
- if (!cur_dev
|| !cur_dev->block_read
)
+ if (!cur_dev)
return -1;
return -1;
- ret = cur_dev->block_read(cur_dev, cur_part_info.start + block,
- nr_blocks, buf);
+ ret = blk_dread(cur_dev, cur_part_info.start + block, nr_blocks, buf);
if (nr_blocks && ret == 0)
return -1;
if (nr_blocks && ret == 0)
return -1;
@@
-60,7
+60,7
@@
static int disk_read(__u32 block, __u32 nr_blocks, void *buf)
return ret;
}
return ret;
}
-int fat_set_blk_dev(
block_dev_desc_t
*dev_desc, disk_partition_t *info)
+int fat_set_blk_dev(
struct blk_desc
*dev_desc, disk_partition_t *info)
{
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
{
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
@@
-89,7
+89,7
@@
int fat_set_blk_dev(block_dev_desc_t *dev_desc, disk_partition_t *info)
return -1;
}
return -1;
}
-int fat_register_device(
block_dev_desc_t
*dev_desc, int part_no)
+int fat_register_device(
struct blk_desc
*dev_desc, int part_no)
{
disk_partition_t info;
{
disk_partition_t info;
@@
-97,10
+97,10
@@
int fat_register_device(block_dev_desc_t *dev_desc, int part_no)
cur_dev = NULL;
/* Read the partition table, if present */
cur_dev = NULL;
/* Read the partition table, if present */
- if (
get_partition
_info(dev_desc, part_no, &info)) {
+ if (
part_get
_info(dev_desc, part_no, &info)) {
if (part_no != 0) {
printf("** Partition %d not valid on device %d **\n",
if (part_no != 0) {
printf("** Partition %d not valid on device %d **\n",
- part_no, dev_desc->dev);
+ part_no, dev_desc->dev
num
);
return -1;
}
return -1;
}
@@
-876,6
+876,7
@@
int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
}
mydata->fatbufnum = -1;
}
mydata->fatbufnum = -1;
+ mydata->fat_dirty = 0;
mydata->fatbuf = memalign(ARCH_DMA_MINALIGN, FATBUFSIZE);
if (mydata->fatbuf == NULL) {
debug("Error: allocating memory\n");
mydata->fatbuf = memalign(ARCH_DMA_MINALIGN, FATBUFSIZE);
if (mydata->fatbuf == NULL) {
debug("Error: allocating memory\n");
@@
-1254,7
+1255,7
@@
int file_fat_detectfs(void)
#if defined(CONFIG_CMD_IDE) || \
defined(CONFIG_CMD_SATA) || \
#if defined(CONFIG_CMD_IDE) || \
defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_
CMD_
SCSI) || \
+ defined(CONFIG_SCSI) || \
defined(CONFIG_CMD_USB) || \
defined(CONFIG_MMC)
printf("Interface: ");
defined(CONFIG_CMD_USB) || \
defined(CONFIG_MMC)
printf("Interface: ");
@@
-1284,7
+1285,7
@@
int file_fat_detectfs(void)
printf("Unknown");
}
printf("Unknown");
}
- printf("\n Device %d: ", cur_dev->dev);
+ printf("\n Device %d: ", cur_dev->dev
num
);
dev_print(cur_dev);
#endif
dev_print(cur_dev);
#endif