diff options
| author | Dees Troy <dees_troy@teamw.in> | 2013-01-07 19:54:47 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@5.9.244.119> | 2013-01-07 19:54:47 +0100 |
| commit | 37407646b957b880876c56c19032b07a1c028656 (patch) | |
| tree | f8274f194bbda84057b90aada803a5a20bf61712 /mtdutils/mtdutils.c | |
| parent | Add mode when open(O_CREAT) is used. (diff) | |
| parent | Work around MEMERASE ioctl for rk3066 compatibility (diff) | |
| download | android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.tar android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.tar.gz android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.tar.bz2 android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.tar.lz android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.tar.xz android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.tar.zst android_bootable_recovery-37407646b957b880876c56c19032b07a1c028656.zip | |
Diffstat (limited to 'mtdutils/mtdutils.c')
| -rw-r--r-- | mtdutils/mtdutils.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mtdutils/mtdutils.c b/mtdutils/mtdutils.c index a76b8e992..032b04bac 100644 --- a/mtdutils/mtdutils.c +++ b/mtdutils/mtdutils.c @@ -28,6 +28,10 @@ #include "mtdutils.h" +#ifdef RK3066 + #include "rk30hack.h" +#endif + struct MtdReadContext { const MtdPartition *partition; char *buffer; @@ -423,11 +427,19 @@ static int write_block(MtdWriteContext *ctx, const char *data) erase_info.length = size; int retry; for (retry = 0; retry < 2; ++retry) { +#ifdef RK3066 + if (rk30_zero_out(fd, pos, size) < 0) { + fprintf(stderr, "mtd: erase failure at 0x%08lx (%s)\n", + pos, strerror(errno)); + continue; + } +#else if (ioctl(fd, MEMERASE, &erase_info) < 0) { fprintf(stderr, "mtd: erase failure at 0x%08lx (%s)\n", pos, strerror(errno)); continue; } +#endif if (lseek(fd, pos, SEEK_SET) != pos || write(fd, data, size) != size) { fprintf(stderr, "mtd: write error at 0x%08lx (%s)\n", @@ -457,7 +469,11 @@ static int write_block(MtdWriteContext *ctx, const char *data) // Try to erase it once more as we give up on this block add_bad_block_offset(ctx, pos); fprintf(stderr, "mtd: skipping write block at 0x%08lx\n", pos); +#ifdef RK3066 + rk30_zero_out(fd, pos, size); +#else ioctl(fd, MEMERASE, &erase_info); +#endif pos += partition->erase_size; } @@ -527,9 +543,15 @@ off_t mtd_erase_blocks(MtdWriteContext *ctx, int blocks) struct erase_info_user erase_info; erase_info.start = pos; erase_info.length = ctx->partition->erase_size; +#ifdef RK3066 + if (rk30_zero_out(ctx->fd, pos, ctx->partition->erase_size) < 0) { + fprintf(stderr, "mtd: erase failure at 0x%08lx\n", pos); + } +#else if (ioctl(ctx->fd, MEMERASE, &erase_info) < 0) { fprintf(stderr, "mtd: erase failure at 0x%08lx\n", pos); } +#endif pos += ctx->partition->erase_size; } |