X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c52dd373c6aae88a4640981f5746e7f727367d15..5b4bdb577c773dd763e13a8bf934683fdbf524fa:/package/mtd/src/mtd.c diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index 92018c23c..761139f4e 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -43,20 +43,11 @@ #include #include #include - #include "mtd-api.h" +#include "mtd.h" -#define TRX_MAGIC 0x30524448 /* "HDR0" */ -#define BUFSIZE (16 * 1024) #define MAX_ARGS 8 - -#define DEBUG - -#define JFFS2_DEFAULT_DIR "tmp" - -#define SYSTYPE_UNKNOWN 0 -#define SYSTYPE_BROADCOM 1 -/* to be continued */ +#define JFFS2_DEFAULT_DIR "" /* directory name without /, empty means root dir */ struct trx_header { uint32_t magic; /* "HDR0" */ @@ -66,14 +57,15 @@ struct trx_header { uint32_t offsets[3]; /* Offsets of partitions from start of header */ }; -static char buf[BUFSIZE]; -static char *imagefile; -static int buflen; +static char *buf = NULL; +static char *imagefile = NULL; +static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR; +static int buflen = 0; int quiet; int mtdsize = 0; int erasesize = 0; -int mtd_open(const char *mtd) +int mtd_open(const char *mtd, bool block) { FILE *fp; char dev[PATH_MAX]; @@ -84,9 +76,9 @@ int mtd_open(const char *mtd) if ((fp = fopen("/proc/mtd", "r"))) { while (fgets(dev, sizeof(dev), fp)) { if (sscanf(dev, "mtd%d:", &i) && strstr(dev, mtd)) { - snprintf(dev, sizeof(dev), "/dev/mtd/%d", i); + snprintf(dev, sizeof(dev), "/dev/mtd%s/%d", (block ? "block" : ""), i); if ((ret=open(dev, flags))<0) { - snprintf(dev, sizeof(dev), "/dev/mtd%d", i); + snprintf(dev, sizeof(dev), "/dev/mtd%s%d", (block ? "block" : ""), i); ret=open(dev, flags); } fclose(fp); @@ -104,7 +96,7 @@ int mtd_check_open(const char *mtd) struct mtd_info_user mtdInfo; int fd; - fd = mtd_open(mtd); + fd = mtd_open(mtd, false); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); return 0; @@ -132,69 +124,25 @@ int mtd_erase_block(int fd, int offset) fprintf(stderr, "Erasing mtd failed.\n"); exit(1); } + return 0; } -int mtd_write_buffer(int fd, char *buf, int offset, int length) +int mtd_write_buffer(int fd, const char *buf, int offset, int length) { lseek(fd, offset, SEEK_SET); write(fd, buf, length); + return 0; } -#ifdef target_brcm -static int -image_check_brcm(int imagefd, const char *mtd) -{ - struct trx_header *trx = (struct trx_header *) buf; - int fd; - - if (strcmp(mtd, "linux") != 0) - return 1; - - buflen = read(imagefd, buf, 32); - if (buflen < 32) { - fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen); - return 0; - } - - if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) { - if (quiet < 2) { - fprintf(stderr, "Bad trx header\n"); - fprintf(stderr, "This is not the correct file format; refusing to flash.\n" - "Please specify the correct file or use -f to force.\n"); - } - return 0; - } - - /* check if image fits to mtd device */ - fd = mtd_check_open(mtd); - if(fd < 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); - } - - if(mtdsize < trx->len) { - fprintf(stderr, "Image too big for partition: %s\n", mtd); - close(fd); - return 0; - } - - close(fd); - return 1; -} -#endif /* target_brcm */ - static int image_check(int imagefd, const char *mtd) { - int fd, systype; - size_t count; - char *c; - FILE *f; - + int ret = 1; #ifdef target_brcm - return image_check_brcm(imagefd, mtd); + ret = trx_check(imagefd, mtd, buf, &buflen); #endif + return ret; } static int mtd_check(const char *mtd) @@ -205,6 +153,9 @@ static int mtd_check(const char *mtd) if (!fd) return 0; + if (!buf) + buf = malloc(erasesize); + close(fd); return 1; } @@ -296,10 +247,8 @@ mtd_refresh(const char *mtd) static int mtd_write(int imagefd, const char *mtd) { - int fd, i, result; - size_t r, w, e; - struct erase_info_user mtdEraseInfo; - int ret = 0; + int fd, result; + ssize_t r, w, e; fd = mtd_check_open(mtd); if(fd < 0) { @@ -316,15 +265,43 @@ mtd_write(int imagefd, const char *mtd) for (;;) { /* buffer may contain data already (from trx check) */ - r = buflen; - r += read(imagefd, buf + buflen, BUFSIZE - buflen); - w += r; + do { + r = read(imagefd, buf + buflen, erasesize - buflen); + if (r < 0) { + if ((errno == EINTR) || (errno == EAGAIN)) + continue; + else { + perror("read"); + break; + } + } + + if (r == 0) + break; + + buflen += r; + } while (buflen < erasesize); - /* EOF */ - if (r <= 0) break; + if (buflen == 0) + break; + + if (jffs2file) { + if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF)) == 0) { + if (!quiet) + fprintf(stderr, "\b\b\b "); + if (quiet < 2) + fprintf(stderr, "\nAppending jffs2 data to from %s to %s...", jffs2file, mtd); + /* got an EOF marker - this is the place to add some jffs2 data */ + mtd_replace_jffs2(mtd, fd, e, jffs2file); + goto done; + } + /* no EOF marker, make sure we figure out the last inode number + * before appending some data */ + mtd_parse_jffs2data(buf, jffs2dir); + } /* need to erase the next block before writing data to it */ - while (w > e) { + while (w + buflen > e) { if (!quiet) fprintf(stderr, "\b\b\b[e]"); @@ -337,7 +314,7 @@ mtd_write(int imagefd, const char *mtd) if (!quiet) fprintf(stderr, "\b\b\b[w]"); - if ((result = write(fd, buf, r)) < r) { + if ((result = write(fd, buf, buflen)) < buflen) { if (result < 0) { fprintf(stderr, "Error writing image.\n"); exit(1); @@ -346,12 +323,14 @@ mtd_write(int imagefd, const char *mtd) exit(1); } } - + w += buflen; + buflen = 0; } if (!quiet) fprintf(stderr, "\b\b\b\b"); +done: if (quiet < 2) fprintf(stderr, "\n"); @@ -376,6 +355,7 @@ static void usage(void) " -f force write without trx checks\n" " -e erase before executing the command\n" " -d directory for jffs2write, defaults to \"tmp\"\n" + " -j integrate into jffs2 data when writing an image\n" "\n" "Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n" " mtd -r write linux.trx linux\n\n"); @@ -397,16 +377,15 @@ static void do_reboot(void) int main (int argc, char **argv) { - int ch, i, boot, unlock, imagefd, force, unlocked; - char *erase[MAX_ARGS], *device; - char *jffs2dir = JFFS2_DEFAULT_DIR; + int ch, i, boot, imagefd = 0, force, unlocked; + char *erase[MAX_ARGS], *device = NULL; enum { CMD_ERASE, CMD_WRITE, CMD_UNLOCK, CMD_REFRESH, CMD_JFFS2WRITE - } cmd; + } cmd = -1; erase[0] = NULL; boot = 0; @@ -414,7 +393,7 @@ int main (int argc, char **argv) buflen = 0; quiet = 0; - while ((ch = getopt(argc, argv, "frqe:d:")) != -1) + while ((ch = getopt(argc, argv, "frqe:d:j:")) != -1) switch (ch) { case 'f': force = 1; @@ -422,6 +401,9 @@ int main (int argc, char **argv) case 'r': boot = 1; break; + case 'j': + jffs2file = optarg; + break; case 'q': quiet++; break; @@ -470,17 +452,14 @@ int main (int argc, char **argv) } } + if (!mtd_check(device)) { + fprintf(stderr, "Can't open device for writing!\n"); + exit(1); + } /* check trx file before erasing or writing anything */ - if (!image_check(imagefd, device)) { - if (!force) { - fprintf(stderr, "Image check failed.\n"); - exit(1); - } - } else { - if (!mtd_check(device)) { - fprintf(stderr, "Can't open device for writing!\n"); - exit(1); - } + if (!image_check(imagefd, device) && !force) { + fprintf(stderr, "Image check failed.\n"); + exit(1); } } else if ((strcmp(argv[0], "jffs2write") == 0) && (argc == 3)) { cmd = CMD_JFFS2WRITE;