random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

dfu: mmc: rearrange the code

Browse Source 
Rename functions for bufferred file io operations to make them easier to
understand. Also add missing file offset argument to them (currently
unused). All this is a preparation to remove predefined file size limit
(CONFIG_SYS_DFU_MAX_FILE_SIZE) for DFU read/write operations.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
This commit is contained in:
Marek Szyprowski 2019-12-02 12:11:15 +01:00 committed by Matthias Brugger
parent b00c3c995b
commit 774f8b00b6
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/dfu/dfu_mmc.c
View File

@ -91,22 +91,8 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
return 0; return 0;
} }
static int mmc_file_buffer(struct dfu_entity *dfu, void *buf, long *len)
{
if (dfu_file_buf_len + *len > CONFIG_SYS_DFU_MAX_FILE_SIZE) {
dfu_file_buf_len = 0;
return -EINVAL;
}
/* Add to the current buffer. */
memcpy(dfu_file_buf + dfu_file_buf_len, buf, *len);
dfu_file_buf_len += *len;
return 0;
}
static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
void *buf, u64 *len) u64 offset, void *buf, u64 *len)
{ {
char dev_part_str[8]; char dev_part_str[8];
int ret; int ret;
@ -137,7 +123,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
switch (op) { switch (op) {
case DFU_OP_READ: case DFU_OP_READ:
ret = fs_read(dfu->name, (size_t)buf, 0, 0, &size); ret = fs_read(dfu->name, (size_t)buf, offset, 0, &size);
if (ret) { if (ret) {
puts("dfu: fs_read error!\n"); puts("dfu: fs_read error!\n");
return ret; return ret;
@ -145,7 +131,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
*len = size; *len = size;
break; break;
case DFU_OP_WRITE: case DFU_OP_WRITE:
ret = fs_write(dfu->name, (size_t)buf, 0, *len, &size); ret = fs_write(dfu->name, (size_t)buf, offset, *len, &size);
if (ret) { if (ret) {
puts("dfu: fs_write error!\n"); puts("dfu: fs_write error!\n");
return ret; return ret;
@ -166,6 +152,30 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
return ret; return ret;
} }
static int mmc_file_buf_write(struct dfu_entity *dfu, u64 offset, void *buf, long *len)
{
if (dfu_file_buf_len + *len > CONFIG_SYS_DFU_MAX_FILE_SIZE) {
dfu_file_buf_len = 0;
return -EINVAL;
}
/* Add to the current buffer. */
memcpy(dfu_file_buf + dfu_file_buf_len, buf, *len);
dfu_file_buf_len += *len;
return 0;
}
static int mmc_file_buf_write_finish(struct dfu_entity *dfu)
{
int ret = mmc_file_op(DFU_OP_WRITE, dfu, 0, dfu_file_buf,
&dfu_file_buf_len);
/* Now that we're done */
dfu_file_buf_len = 0;
return ret;
}
int dfu_write_medium_mmc(struct dfu_entity *dfu, int dfu_write_medium_mmc(struct dfu_entity *dfu,
u64 offset, void *buf, long *len) u64 offset, void *buf, long *len)
{ {
@ -177,7 +187,7 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu,
break; break;
case DFU_FS_FAT: case DFU_FS_FAT:
case DFU_FS_EXT4: case DFU_FS_EXT4:
ret = mmc_file_buffer(dfu, buf, len); ret = mmc_file_buf_write(dfu, offset, buf, len);
break; break;
default: default:
printf("%s: Layout (%s) not (yet) supported!\n", __func__, printf("%s: Layout (%s) not (yet) supported!\n", __func__,
@ -193,11 +203,7 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu)
if (dfu->layout != DFU_RAW_ADDR) { if (dfu->layout != DFU_RAW_ADDR) {
/* Do stuff here. */ /* Do stuff here. */
ret = mmc_file_op(DFU_OP_WRITE, dfu, dfu_file_buf, ret = mmc_file_buf_write_finish(dfu);
&dfu_file_buf_len);
/* Now that we're done */
dfu_file_buf_len = 0;
} }
return ret; return ret;
@ -214,7 +220,7 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size)
case DFU_FS_FAT: case DFU_FS_FAT:
case DFU_FS_EXT4: case DFU_FS_EXT4:
dfu_file_buf_filled = -1; dfu_file_buf_filled = -1;
ret = mmc_file_op(DFU_OP_SIZE, dfu, NULL, size); ret = mmc_file_op(DFU_OP_SIZE, dfu, 0, NULL, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (*size > CONFIG_SYS_DFU_MAX_FILE_SIZE) if (*size > CONFIG_SYS_DFU_MAX_FILE_SIZE)
@ -227,14 +233,15 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size)
} }
} }
static int mmc_file_unbuffer(struct dfu_entity *dfu, u64 offset, void *buf,
static int mmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf,
long *len) long *len)
{ {
int ret; int ret;
u64 file_len; u64 file_len;
if (dfu_file_buf_filled == -1) { if (dfu_file_buf_filled == -1) {
ret = mmc_file_op(DFU_OP_READ, dfu, dfu_file_buf, &file_len); ret = mmc_file_op(DFU_OP_READ, dfu, 0, dfu_file_buf, &file_len);
if (ret < 0) if (ret < 0)
return ret; return ret;
dfu_file_buf_filled = file_len; dfu_file_buf_filled = file_len;
@ -259,7 +266,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
break; break;
case DFU_FS_FAT: case DFU_FS_FAT:
case DFU_FS_EXT4: case DFU_FS_EXT4:
ret = mmc_file_unbuffer(dfu, offset, buf, len); ret = mmc_file_buf_read(dfu, offset, buf, len);
break; break;
default: default:
printf("%s: Layout (%s) not (yet) supported!\n", __func__, printf("%s: Layout (%s) not (yet) supported!\n", __func__,