summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-06 00:09:11 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-06-06 15:26:15 +0300
commit6534b670520f7709b2ba73a853a50372653c4726 (patch)
tree3b23d97d4ddbdf0ebad737b6845e8d082cd0eb70
parent3e4c601e5c00f3bb5844402954d9b9dcf9387da2 (diff)
flash_{lock,unlock}: merge functionality
The flash_lock util has a bit of extra argument checking, and it supports a magic value of "-1" to mean "all blocks". The flash_unlock util supports automatic 2nd/3rd arguments to unlock the whole flash. It also supports multiple bases (not just hex) for selecting the range of the device to unlock. So tweak both utilities so that they have equivalent functionality again by adding the missing features to each. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--flash_lock.c41
-rw-r--r--flash_unlock.c17
2 files changed, 38 insertions, 20 deletions
diff --git a/flash_lock.c b/flash_lock.c
index 8cd1b82..164eaa4 100644
--- a/flash_lock.c
+++ b/flash_lock.c
@@ -23,14 +23,13 @@ int main(int argc, char *argv[])
int fd;
struct mtd_info_user mtdInfo;
struct erase_info_user mtdLockInfo;
- int num_sectors;
- int ofs;
+ int count;
/*
* Parse command line options
*/
- if (argc != 4) {
- fprintf(stderr, "USAGE: %s <mtd device> <ofs in hex> <num of sectors in decimal or -1 for all sectors>\n", PROGRAM_NAME);
+ if (argc < 2) {
+ fprintf(stderr, "USAGE: %s <mtd device> <offset> <block count>\n", PROGRAM_NAME);
exit(1);
} else if (strncmp(argv[1], "/dev/mtd", 8) != 0) {
fprintf(stderr, "'%s' is not a MTD device. Must specify mtd device: /dev/mtd?\n", argv[1]);
@@ -48,26 +47,32 @@ int main(int argc, char *argv[])
close(fd);
exit(1);
}
- sscanf(argv[2], "%x", &ofs);
- sscanf(argv[3], "%d", &num_sectors);
- if (ofs > mtdInfo.size - mtdInfo.erasesize) {
- fprintf(stderr, "%x is beyond device size %x\n", ofs,
- (unsigned int)(mtdInfo.size - mtdInfo.erasesize));
+
+ if (argc > 2)
+ mtdLockInfo.start = strtol(argv[2], NULL, 0);
+ else
+ mtdLockInfo.start = 0;
+ if (mtdLockInfo.start > mtdInfo.size) {
+ fprintf(stderr, "%#x is beyond device size %#x\n",
+ mtdLockInfo.start, mtdInfo.size);
+ close(fd);
exit(1);
}
- if (num_sectors == -1) {
- num_sectors = mtdInfo.size / mtdInfo.erasesize;
+ if (argc > 3) {
+ count = strtol(argv[3], NULL, 0);
+ if (count == -1)
+ mtdLockInfo.length = mtdInfo.size - mtdInfo.erasesize;
+ else
+ mtdLockInfo.length = mtdInfo.erasesize * count;
} else {
- if (num_sectors > mtdInfo.size / mtdInfo.erasesize) {
- fprintf(stderr, "%d are too many sectors, device only has %d\n",
- num_sectors, (int)(mtdInfo.size / mtdInfo.erasesize));
- exit(1);
- }
+ mtdLockInfo.length = mtdInfo.size - mtdInfo.erasesize;
+ }
+ if (mtdLockInfo.start + mtdLockInfo.length > mtdInfo.size) {
+ fprintf(stderr, "lock range is more than device supports\n");
+ exit(1);
}
- mtdLockInfo.start = ofs;
- mtdLockInfo.length = (num_sectors - 1) * mtdInfo.erasesize;
if (ioctl(fd, MEMLOCK, &mtdLockInfo)) {
fprintf(stderr, "Could not lock MTD device: %s\n", argv[1]);
close(fd);
diff --git a/flash_unlock.c b/flash_unlock.c
index 26721a5..690825d 100644
--- a/flash_unlock.c
+++ b/flash_unlock.c
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
* Parse command line options
*/
if (argc < 2) {
- fprintf(stderr, "USAGE: %s <mtd device> <offset in hex> <block count in decimal number>\n", PROGRAM_NAME);
+ fprintf(stderr, "USAGE: %s <mtd device> <offset> <block count>\n", PROGRAM_NAME);
exit(1);
} else if (strncmp(argv[1], "/dev/mtd", 8) != 0) {
fprintf(stderr, "'%s' is not a MTD device. Must specify mtd device: /dev/mtd?\n", argv[1]);
@@ -52,13 +52,26 @@ int main(int argc, char *argv[])
mtdLockInfo.start = strtol(argv[2], NULL, 0);
else
mtdLockInfo.start = 0;
+ if (mtdLockInfo.start > mtdInfo.size) {
+ fprintf(stderr, "%#x is beyond device size %#x\n",
+ mtdLockInfo.start, mtdInfo.size);
+ close(fd);
+ exit(1);
+ }
if (argc > 3) {
count = strtol(argv[3], NULL, 0);
- mtdLockInfo.length = mtdInfo.erasesize * count;
+ if (count == -1)
+ mtdLockInfo.length = mtdInfo.size - mtdInfo.erasesize;
+ else
+ mtdLockInfo.length = mtdInfo.erasesize * count;
} else {
mtdLockInfo.length = mtdInfo.size - mtdInfo.erasesize;
}
+ if (mtdLockInfo.start + mtdLockInfo.length > mtdInfo.size) {
+ fprintf(stderr, "unlock range is more than device supports\n");
+ exit(1);
+ }
if (ioctl(fd, MEMUNLOCK, &mtdLockInfo)) {
fprintf(stderr, "Could not unlock MTD device: %s\n", argv[1]);