summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docfdisk.c16
-rw-r--r--flash_otp_write.c6
-rw-r--r--include/mtd/mtd-abi.h2
-rw-r--r--mtd_debug.c4
-rw-r--r--nanddump.c10
-rw-r--r--nandwrite.c20
6 files changed, 29 insertions, 29 deletions
diff --git a/docfdisk.c b/docfdisk.c
index b275df9..4d2dab4 100644
--- a/docfdisk.c
+++ b/docfdisk.c
@@ -194,7 +194,7 @@ int main(int argc, char **argv)
meminfo.size, meminfo.erasesize);
buf = malloc(meminfo.erasesize);
- oobbuf = malloc((meminfo.erasesize / meminfo.oobblock) * meminfo.oobsize);
+ oobbuf = malloc((meminfo.erasesize / meminfo.writesize) * meminfo.oobsize);
if (!buf || !oobbuf) {
printf("Can't malloc block buffer\n");
return 1;
@@ -227,12 +227,12 @@ int main(int argc, char **argv)
oob.ptr = oobbuf;
oob.start = mhoffs;
- for (i = 0; i < meminfo.erasesize; i += meminfo.oobblock) {
+ for (i = 0; i < meminfo.erasesize; i += meminfo.writesize) {
if (ioctl(fd, MEMREADOOB, &oob)) {
perror("ioctl(MEMREADOOB)");
return 1;
}
- oob.start += meminfo.oobblock;
+ oob.start += meminfo.writesize;
oob.ptr += meminfo.oobsize;
}
@@ -292,27 +292,27 @@ int main(int argc, char **argv)
oob.ptr = oobbuf;
oob.start = mhoffs;
- for (i = 0; i < meminfo.erasesize; i += meminfo.oobblock) {
+ for (i = 0; i < meminfo.erasesize; i += meminfo.writesize) {
memset(oob.ptr, 0xff, 6); // clear ECC.
if (ioctl(fd, MEMWRITEOOB, &oob)) {
perror("ioctl(MEMWRITEOOB)");
printf("Your MediaHeader may be hosed. UHOH!\n");
return 1;
}
- if ((ret = pwrite(fd, buf, meminfo.oobblock, oob.start)) < 0) {
+ if ((ret = pwrite(fd, buf, meminfo.writesize, oob.start)) < 0) {
perror("Write page");
printf("Your MediaHeader may be hosed. UHOH!\n");
return 1;
}
- if (ret != meminfo.oobblock) {
+ if (ret != meminfo.writesize) {
printf("Short write!\n");
printf("Your MediaHeader may be hosed. UHOH!\n");
return 1;
}
- oob.start += meminfo.oobblock;
+ oob.start += meminfo.writesize;
oob.ptr += meminfo.oobsize;
- buf += meminfo.oobblock;
+ buf += meminfo.writesize;
}
printf("Success. REBOOT or unload the diskonchip module to update partitions!\n");
diff --git a/flash_otp_write.c b/flash_otp_write.c
index 71d3168..4cadcdf 100644
--- a/flash_otp_write.c
+++ b/flash_otp_write.c
@@ -59,7 +59,7 @@ int main(int argc,char *argv[])
printf("Writing OTP user data on %s at offset 0x%lx\n", argv[2], offset);
if (mtdInfo.type == MTD_NANDFLASH)
- len = mtdInfo.oobblock;
+ len = mtdInfo.writesize;
else
len = 256;
@@ -73,8 +73,8 @@ int main(int argc,char *argv[])
while (size > 0) {
if (mtdInfo.type == MTD_NANDFLASH) {
/* Fill remain buffers with 0xff */
- memset(buf + size, 0xff, mtdInfo.oobblock - size);
- size = mtdInfo.oobblock;
+ memset(buf + size, 0xff, mtdInfo.writesize - size);
+ size = mtdInfo.writesize;
}
ret = write(fd, p, size);
if (ret < 0) {
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index fa25241..5097056 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -65,7 +65,7 @@ struct mtd_info_user {
uint32_t flags;
uint32_t size; // Total size of the MTD
uint32_t erasesize;
- uint32_t oobblock; // Size of OOB blocks (e.g. 512)
+ uint32_t writesize;
uint32_t oobsize; // Amount of OOB data per block (e.g. 16)
uint32_t ecctype;
uint32_t eccsize;
diff --git a/mtd_debug.c b/mtd_debug.c
index 7d1223c..2a24177 100644
--- a/mtd_debug.c
+++ b/mtd_debug.c
@@ -319,8 +319,8 @@ int showinfo (int fd)
printf ("\nmtd.erasesize = ");
printsize (mtd.erasesize);
- printf ("\nmtd.oobblock = ");
- printsize (mtd.oobblock);
+ printf ("\nmtd.writesize = ");
+ printsize (mtd.writesize);
printf ("\nmtd.oobsize = ");
printsize (mtd.oobsize);
diff --git a/nanddump.c b/nanddump.c
index a010387..a03c79a 100644
--- a/nanddump.c
+++ b/nanddump.c
@@ -192,9 +192,9 @@ int main(int argc, char **argv)
}
/* Make sure device page sizes are valid */
- if (!(meminfo.oobsize == 64 && meminfo.oobblock == 2048) &&
- !(meminfo.oobsize == 16 && meminfo.oobblock == 512) &&
- !(meminfo.oobsize == 8 && meminfo.oobblock == 256)) {
+ if (!(meminfo.oobsize == 64 && meminfo.writesize == 2048) &&
+ !(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
+ !(meminfo.oobsize == 8 && meminfo.writesize == 256)) {
fprintf(stderr, "Unknown flash (not normal NAND)\n");
close(fd);
exit(1);
@@ -232,10 +232,10 @@ int main(int argc, char **argv)
if (!length || end_addr > meminfo.size)
end_addr = meminfo.size;
- bs = meminfo.oobblock;
+ bs = meminfo.writesize;
/* Print informative message */
- fprintf(stderr, "Block size %u, page size %u, OOB size %u\n", meminfo.erasesize, meminfo.oobblock, meminfo.oobsize);
+ fprintf(stderr, "Block size %u, page size %u, OOB size %u\n", meminfo.erasesize, meminfo.writesize, meminfo.oobsize);
fprintf(stderr, "Dumping data starting at 0x%08x and ending at 0x%08x...\n",
(unsigned int) start_addr, (unsigned int) end_addr);
diff --git a/nandwrite.c b/nandwrite.c
index fe19b82..10489b7 100644
--- a/nandwrite.c
+++ b/nandwrite.c
@@ -240,9 +240,9 @@ int main(int argc, char **argv)
meminfo.erasesize *= blockalign;
/* Make sure device page sizes are valid */
- if (!(meminfo.oobsize == 16 && meminfo.oobblock == 512) &&
- !(meminfo.oobsize == 8 && meminfo.oobblock == 256) &&
- !(meminfo.oobsize == 64 && meminfo.oobblock == 2048)) {
+ if (!(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
+ !(meminfo.oobsize == 8 && meminfo.writesize == 256) &&
+ !(meminfo.oobsize == 64 && meminfo.writesize == 2048)) {
fprintf(stderr, "Unknown flash (not normal NAND)\n");
close(fd);
exit(1);
@@ -319,7 +319,7 @@ int main(int argc, char **argv)
imglen = lseek(ifd, 0, SEEK_END);
lseek (ifd, 0, SEEK_SET);
- pagelen = meminfo.oobblock + ((writeoob == 1) ? meminfo.oobsize : 0);
+ pagelen = meminfo.writesize + ((writeoob == 1) ? meminfo.oobsize : 0);
// Check, if file is pagealigned
if ((!pad) && ((imglen % pagelen) != 0)) {
@@ -328,9 +328,9 @@ int main(int argc, char **argv)
}
// Check, if length fits into device
- if ( ((imglen / pagelen) * meminfo.oobblock) > (meminfo.size - mtdoffset)) {
+ if ( ((imglen / pagelen) * meminfo.writesize) > (meminfo.size - mtdoffset)) {
fprintf (stderr, "Image %d bytes, NAND page %d bytes, OOB area %u bytes, device size %u bytes\n",
- imglen, pagelen, meminfo.oobblock, meminfo.size);
+ imglen, pagelen, meminfo.writesize, meminfo.size);
perror ("Input file does not fit into device");
goto closeall;
}
@@ -370,11 +370,11 @@ int main(int argc, char **argv)
}
- readlen = meminfo.oobblock;
+ readlen = meminfo.writesize;
if (pad && (imglen < readlen))
{
readlen = imglen;
- memset(writebuf + readlen, 0xff, meminfo.oobblock - readlen);
+ memset(writebuf + readlen, 0xff, meminfo.writesize - readlen);
}
/* Read Page Data from input file */
@@ -428,12 +428,12 @@ int main(int argc, char **argv)
}
/* Write out the Page data */
- if (pwrite(fd, writebuf, meminfo.oobblock, mtdoffset) != meminfo.oobblock) {
+ if (pwrite(fd, writebuf, meminfo.writesize, mtdoffset) != meminfo.writesize) {
perror ("pwrite");
goto closeall;
}
imglen -= readlen;
- mtdoffset += meminfo.oobblock;
+ mtdoffset += meminfo.writesize;
}
closeall:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 04:03:18 +0000