From 7b5d36bd4cc7e2d3483f940a3231d74186e4d477 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Tue, 20 Nov 2012 22:02:56 +0100 Subject: Remove old dump code --- src/Makefile | 2 +- src/dump.c | 646 ----------------------------------------------------------- src/dump.h | 28 --- 3 files changed, 1 insertion(+), 675 deletions(-) delete mode 100644 src/dump.c delete mode 100644 src/dump.h (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 7d9af39..1e2602c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_GNU_SOURCE -I. CFLAGS += -W -Wall -O2 -pedantic -std=c99 LIBS += -lm -lusb -OBJS = main.o nolo.o printf-utils.o image.o fiasco.o device.o usb-device.o cold-flash.o dump.o qmode.o console.o squeue/squeue.o operations.o local.o mkii.o disk.o +OBJS = main.o nolo.o printf-utils.o image.o fiasco.o device.o usb-device.o cold-flash.o qmode.o console.o squeue/squeue.o operations.o local.o mkii.o disk.o BIN = 0xFFFF all: $(BIN) diff --git a/src/dump.c b/src/dump.c deleted file mode 100644 index 1931c99..0000000 --- a/src/dump.c +++ /dev/null @@ -1,646 +0,0 @@ -/* - * 0xFFFF - Open Free Fiasco Firmware Flasher - * Copyright (C) 2007-2009 pancake - * Copyright (C) 2012 Pali Rohár - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "global.h" - -#include "dump.h" -#include "printf-utils.h" - -/* - * Extracts a piece from an mtd device - * ----------------------------------- - * This function is known to be buggy, It does not takes care about - * badblocks and oob data. It is replaced by nanddump(), but will - * probably be fixed in the future or it will die. - */ -/*int rf_extract(char *dev, off_t from, off_t to, char *file) -{ - off_t i, blk = 0xfffff; - char buf[0xfffff]; - FILE *fs = fopen(dev, "rb"); - FILE *fd = fopen(file, "wb+"); - - if (from>to) { - printf("Bad range %lld - %lld for %s\n", (long long int)from, (long long int)to, file); - goto __rf_extract_exit; - } - if (fs == NULL) { perror(dev); goto __rf_extract_exit; } - if (fd == NULL) { perror(file); goto __rf_extract_exit; } - - printf("Extracting %s...\n", file); - fseek(fs, from, SEEK_SET); - - for(i=from;ito) blk = to-i; - ret = fread(buf, blk, 1, fs); - progressbar(i, to); - if (!ret || feof(fs)) break; - fwrite(buf, blk, 1, fd); - } - - printf("\r%s: %lld bytes dumped from %s\n", - file, (long long int)(to-from), dev); - -__rf_extract_exit: - if (fs) fclose(fs); - if (fd) fclose(fd); - - return 1; -}*/ - -/* - * This function was covardly copied from nanddump.c @ mtd-utils-20060907 - */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#ifndef loff_t -#define loff_t off_t -#endif - -#define M_RDONLY 0x00000001 -#define M_RDRW 0x00000002 -#define M_OMITOOB 0x00000010 -#define M_OMITBAD 0x00000011 -#define M_OMITECC 0x00000012 - -static int mtd_open(char *file, mtd_info_t *meminfo, int *oobinfochanged, - struct nand_oobinfo *old_oobinfo, int *eccstats, int flags) -{ - int fd; - *oobinfochanged = 0 ; - - fd = open(file, (flags&M_RDONLY)?O_RDONLY:O_RDWR); - if (fd == -1) { - perror("mtd_open"); - return -1; - } - /* Fill in MTD device capability structure */ - if (ioctl(fd, MEMGETINFO, meminfo) != 0) { - perror("MEMGETINFO"); - close(fd); - return 1; - } - - /* Make sure device page sizes are valid */ - 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); - return -1; - } - - return fd; -} - -static int mtd_close(int fd, struct nand_oobinfo *old_oobinfo, int oobinfochanged) -{ - if (fd == -1) - return 1; - - /* reset oobinfo */ - if (oobinfochanged == 1) { - if (ioctl (fd, MEMSETOOBSEL, &old_oobinfo) != 0) { - perror ("MEMSETOOBSEL"); - close(fd); - return 1; - } - } - /* Close the output file and MTD device */ - return close(fd); -} - -// configuration for nanddump // -//int noecc = 0; // don't error correct -static int omitoob = 1; // omit oob data -static int omitbad = 1; -// configuration for nanddump // - -#define CONFIGURE_FLAGS(x) \ -omitoob = x & M_OMITOOB; \ -omitbad = x & M_OMITBAD; - -int check_badblocks(char *mtddev) -{ - int fd; - int oobinfochanged = 0 ; - int badblock = 0; - int badblocks = 1; - int eccstats = 0; - unsigned long int i; - unsigned long long blockstart = 1; - unsigned char oobbuf[64]; - struct nand_oobinfo old_oobinfo; - struct mtd_oob_buf oob = {0, 16, oobbuf}; - /* XXX stat1 is never initialized !!! */ - struct mtd_ecc_stats stat1, stat2; - mtd_info_t meminfo; - - fd = mtd_open(mtddev, &meminfo, &oobinfochanged, &old_oobinfo, &eccstats, M_RDONLY); - - if (fd == -1) { - printf("cannot open mtd\n"); - return 1; - } - - fprintf(stderr, "Block size %u, page size %u, OOB size %u\n", - meminfo.erasesize, meminfo.writesize, meminfo.oobsize); - fprintf(stderr, "Size %u, flags %u, type 0x%x\n", - meminfo.size, meminfo.flags, (int)meminfo.type); - - oob.length = meminfo.oobsize; - for(i = 0; i < meminfo.size; i+= meminfo.writesize) { - - // new eraseblock , check for bad block - if (blockstart != (i & (~meminfo.erasesize + 1))) { - blockstart = i & (~meminfo.erasesize + 1); - if ((badblock = ioctl(fd, MEMGETBADBLOCK, &blockstart)) < 0) { - perror("ioctl(MEMGETBADBLOCK)"); - goto closeall; - } - } - - if (badblock) { - if (omitbad) { - printf("Bad block found at 0x%lx\n", i); - continue; - } - } else { - char readbuf[2048]; // XXX hardcoded like mtd-utils?? ugly! - // dummy -- should be removed - if (pread(fd, readbuf, meminfo.writesize, i) != (ssize_t)meminfo.writesize) { - perror("pread"); - goto closeall; - } - } - - /* ECC stats available ? */ - memset (&stat1, 0, sizeof (stat1)); - if (eccstats) { - if (ioctl (fd, ECCGETSTATS, &stat2)) { - perror("ioctl(ECCGETSTATS)"); - goto closeall; - } - if (stat1.failed != stat2.failed) - fprintf(stderr, "ECC: %d uncorrectable bitflip(s)" - " at offset 0x%08lx\n", - stat2.failed - stat1.failed, i); - if (stat1.corrected != stat2.corrected) - fprintf(stderr, "ECC: %d corrected bitflip(s) at" - " offset 0x%08lx\n", - stat2.corrected - stat1.corrected, i); - stat1 = stat2; - } - - if (badblock) { - printf("Oops badblock %d at 0x%lx !\n", badblocks++, i); - } else { - /* Read OOB data and exit on failure */ - oob.start = i; - if (ioctl(fd, MEMREADOOB, &oob) != 0) { - perror("ioctl(MEMREADOOB)"); - goto closeall; - } - } - - /* Write out OOB data */ -// if (badblock) -// D dump_bytes(oobbuf, meminfo.oobsize); - } - - mtd_close(fd, &old_oobinfo, oobinfochanged); - return 0; - -closeall: - mtd_close(fd, &old_oobinfo, oobinfochanged); - return 1; -} - -// XXX warning ioob is not used -// isbl is used to skip bad blocks ? -int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char *dumpfile, int isbl, int ioob) -{ - unsigned char readbuf[2048]; - int oobinfochanged = 0 ; - unsigned char oobbuf[64]; - unsigned long ofs, end_addr = 0; - unsigned long long blockstart = 1; - struct nand_oobinfo none_oobinfo = { - .useecc = MTD_NANDECC_OFF, - }; - int fd, ofd, bs, badblock = 0; - struct mtd_oob_buf oob = {0, 16, oobbuf}; - mtd_info_t meminfo; - int badblocks = 1; - struct nand_oobinfo old_oobinfo; - int eccstats = 0; - struct mtd_ecc_stats stat1, stat2; - int flags = M_RDONLY; - - printf("\nExtracting %s from %s...\n", dumpfile, mtddev); - - fd = mtd_open(mtddev, &meminfo, &oobinfochanged, &old_oobinfo, &eccstats, flags); - - if (meminfo.writesize == 0) { - printf("What the fuck.. this is not an MTD device!\n"); - close(fd); - return 1; - } - - /* Read the real oob length */ - oob.length = meminfo.oobsize; - fprintf(stderr, "Block size %u, page size %u, OOB size %u\n", - meminfo.erasesize, meminfo.writesize, meminfo.oobsize); - fprintf(stderr, "Size %u, flags %u, type 0x%x\n", - meminfo.size, meminfo.flags, (int)meminfo.type); - - if (flags & M_OMITECC) { // (noecc) - switch (ioctl(fd, MTDFILEMODE, (void *) MTD_MODE_RAW)) { - case -ENOTTY: - if (ioctl (fd, MEMGETOOBSEL, old_oobinfo) != 0) { - perror ("MEMGETOOBSEL"); - close (fd); - exit (1); - } - if (ioctl (fd, MEMSETOOBSEL, none_oobinfo) != 0) { - perror ("MEMSETOOBSEL"); - close (fd); - exit (1); - } - oobinfochanged = 1; - break; - - case 0: - oobinfochanged = 2; - break; - default: - perror ("MTDFILEMODE"); - close (fd); - return 1; - } - } else { - /* check if we can read ecc stats */ - if (!ioctl(fd, ECCGETSTATS, &stat1)) { - eccstats = 1; - fprintf(stderr, "ECC failed: %d\n", stat1.failed); - fprintf(stderr, "ECC corrected: %d\n", stat1.corrected); - fprintf(stderr, "Number of bad blocks: %d\n", stat1.badblocks); - fprintf(stderr, "Number of bbt blocks: %d\n", stat1.bbtblocks); - } else - perror("No ECC status information available"); - } - - /* Open output file for writing. If file name is "-", write to standard - * output. */ - if (!dumpfile) { - ofd = STDOUT_FILENO; - } else if ((ofd = open(dumpfile, O_WRONLY | O_TRUNC | O_CREAT, 0644))== -1) { - perror ("open outfile"); - close(fd); - return 1; - } - - /* Initialize start/end addresses and block size */ - if (length) - end_addr = start_addr + length; - if (!length || end_addr > meminfo.size) - end_addr = meminfo.size; - - bs = meminfo.writesize; - - fprintf(stderr, - "Dumping data starting at 0x%08x and ending at 0x%08x...\n", - (unsigned int) start_addr, (unsigned int) end_addr); - - /* Dump the flash contents */ - for (ofs = start_addr; ofs < end_addr ; ofs+=bs) { - // new eraseblock , check for bad block - if (blockstart != (ofs & (~meminfo.erasesize + 1))) { - blockstart = ofs & (~meminfo.erasesize + 1); - if ((badblock = ioctl(fd, MEMGETBADBLOCK, &blockstart)) < 0) { - perror("ioctl(MEMGETBADBLOCK)"); - goto closeall; - } - } - - if (!isbl && badblock) { - if (omitbad) - continue; - memset (readbuf, 0xff, bs); - } else { - /* Read page data and exit on failure */ - if (pread(fd, readbuf, bs, ofs) != bs) { - perror("pread"); - goto closeall; - } - } - - // TODO exist on n800??? // remove code? - /* ECC stats available ? */ - if (eccstats) { - if (ioctl(fd, ECCGETSTATS, &stat2)) { - perror("ioctl(ECCGETSTATS)"); - goto closeall; - } - if (stat1.failed != stat2.failed) - fprintf(stderr, "ECC: %d uncorrectable bitflip(s)" - " at offset 0x%08lx\n", - stat2.failed - stat1.failed, ofs); - if (stat1.corrected != stat2.corrected) - fprintf(stderr, "ECC: %d corrected bitflip(s) at" - " offset 0x%08lx\n", - stat2.corrected - stat1.corrected, ofs); - stat1 = stat2; - } - - /* Write out page data */ - //if (pretty_print) dump_bytes(readbuf, bs); - write(ofd, readbuf, bs); - printf_progressbar(ofs, end_addr); - - // OOB STUFF // - if (omitoob) - continue; - - if (!isbl&&badblock) { - printf("Oops badblock %d *ignored* at 0x%lx !\n", badblocks++, ofs); - memset (readbuf, 0xff, meminfo.oobsize); - } else { - /* Read OOB data and exit on failure */ - oob.start = ofs; - if (ioctl(fd, MEMREADOOB, &oob) != 0) { - perror("ioctl(MEMREADOOB)"); - goto closeall; - } - } - - /* Write out OOB data */ -// D dump_bytes(oobbuf, meminfo.oobsize); - write(ofd, oobbuf, meminfo.oobsize); - } - - mtd_close(fd, &old_oobinfo, oobinfochanged); - close(ofd); - - return 0; - - closeall: - mtd_close(fd, &old_oobinfo, oobinfochanged); - close(ofd); - return 1; -} - -static int rf_strip(char *file) -{ - FILE *fd = fopen(file, "rw"); - unsigned char buf[4096]; - int ret; - off_t eof = 0; - - if (!fd) { - fprintf(stderr, "Weird! can't open %s???\n", file); - exit(0); - } - printf("Stripping padding from %s... ", file); - fflush(stdout); - fseek(fd, 0, SEEK_END); - if (ftell(fd)>4096) { - do { - fseek(fd, -4096, SEEK_CUR); - ret = fread(buf, 1, 4096, fd); - fseek(fd, -4096, SEEK_CUR); - for(ret--;ret>0;ret--) - if (buf[ret]!=0xff) { - fseek(fd, ret+1, SEEK_CUR); - eof = ftell(fd); - goto __done; - } - } while(1); - } - -__done: - fclose(fd); - if (eof) truncate(file, eof); - printf("done at %d\n", (int)eof); - - return 1; -} - -static int is_n900(void) -{ - int n900 = 0; - unsigned char buf[4]; - FILE *fd = fopen("/dev/mtd2", "rb"); - if (!fd) { - fprintf(stderr, "Cannot open /dev/mtd2.\n"); - exit(1); - } - fread(buf, 4, 1, fd); - if (!memcmp("\xff\xff\xff\xff", buf, 4)) - n900 = 1; - fclose(fd); - return n900; -} - -static int is_n800(void) -{ - int n800 = 0; - unsigned char buf[4]; - FILE *fd = fopen("/dev/mtd0", "rb"); - if (!fd) { - fprintf(stderr, "Cannot open /dev/mtd0.\n"); - exit(1); - } - fread(buf, 4, 1, fd); - if (!memcmp("\xff\xff\xff\xff", buf, 4)) - n800 = 1; - fclose(fd); - return n800; -} - -int dump_config(void) -{ - mtd_info_t meminfo; - int fd = open("/dev/mtd1", O_RDONLY); - char buf[1024]; - int i=0,j; - int ret; - - - if (fd == -1) { - perror("open /dev/mtd1"); - return 1; - } - if (ioctl(fd, MEMGETINFO, &meminfo) != 0) { - perror("MEMGETINFO"); - close(fd); - return 1; - } - - while(i<0x60000) { - iniloop: - ret = read(fd, buf, 4); - if (ret == -1) - break; - if (!memcmp(buf,"ConF", 4)) { - loop: - read(fd, buf, 4); - if (ret == -1) break; - printf("\n0x%08x : ConF %02x %02x %02x %02x : ", i, - buf[0], buf[1], buf[2], buf[3]); - fflush(stdout); - while(1) { - ret = read(fd, buf, 4); - if (ret <1) { - printf("Unexpected eof\n"); - break; - } - if (buf[0]=='\0'||buf[1]=='\0'||buf[2]=='\0'||buf[3]=='\0') { - printf("%s \t ", buf); - fflush(stdout); - while(1) { - ret = read(fd, buf, 4); - if (ret <1) { - printf("Unexpected eof\n"); - break; - } - if (!memcmp(buf,"\xff\xff\xff\xff", 4)) - goto iniloop; - if (!memcmp(buf,"ConF", 4)) - goto loop; - printf ("%02x %02x %02x %02x ", - buf[0], buf[1], buf[2], buf[3]); - } - break; - } else { - write(1, buf,4); - } - } - } - j = lseek(fd, 0, SEEK_CUR); - if (j==i) break; i = j; - } - close(fd); - printf("\n"); - return 0; -} - -static int reverse_extract_pieces_n900(char *dir) -{ - char reply; - chdir(dir); - printf("Device detected: n900\n"); - // Some of the values here are probably not correct - // I need a firmware to identify if the sizes of the pieces are ok - - nanddump("/dev/mtd0", 0, 0, "xloader.bin", 1, 0); // fix size? - nanddump("/dev/mtd1", 0, 0, "config.bin", 1, 0); - nanddump("/dev/mtd3", 0, 0, "nolo.bin", 0, 0); - - printf("\n\nExtract rootfs? (y/N): "); fflush(stdout); - read(0, &reply, 1); - if (reply=='y'||reply=='Y') { - //rf_extract("/dev/mtd4", 0x000000, 0x6000000, "rootfs.jffs2"); - nanddump("/dev/mtd5", 0x000000, 0, "rootfs.jffs2", 0,0); - } else printf("*** Ignoring rootfs\n"); - - printf("\n\nStrip dumped files? (y/N): "); fflush(stdout); - read(0, &reply, 1); - if (reply=='y'||reply=='Y') { - rf_strip("xloader.bin"); - rf_strip("config.bin"); - rf_strip("nolo.bin"); - } else printf("*** Ignoring strip\n"); - -/* printf("\nIdentifying extracted files...\n"); - printf("%s: xloader\n", fpid_file("xloader.bin")); - printf("%s: config.bin\n", fpid_file("config.bin")); - printf("%s: nolo.bin\n", fpid_file("nolo.bin")); - printf("%s: rootfs.jffs2\n", fpid_file("rootfs.jffs2"));*/ - - return 1; -} - -int reverse_extract_pieces(char *dir) -{ - char reply; - - if (is_n900()) - return reverse_extract_pieces_n900(dir); - - printf("Device detected: 770/n800/n900\n"); - chdir(dir); - - // TODO: get values from /proc/mtd ??? - - //rf_extract("/dev/mtd0", is_n800()?0x200:0, 0x003600, "xloader.bin"); - nanddump("/dev/mtd0", is_n800()?0x200:0, 0x4000, "xloader.bin", 1,0); // 0x3600 size? - //rf_extract("/dev/mtd0", 0x004000, 0x01ffff, "secondary.bin"); - nanddump("/dev/mtd0", 0x004000, 0, "secondary.bin", 1,0); - nanddump("/dev/mtd1", 0, 0, "config.bin", 0,0); - //rf_extract("/dev/mtd2", 0x000800, 0x200000, "zImage"); - nanddump("/dev/mtd2", 0x000800, 0, "zImage", 0,0); - //rf_extract("/dev/mtd3", 0x000000, 0x1D00000, "initfs.jffs2"); - nanddump("/dev/mtd3", 0x000000, 0, "initfs.jffs2", 0,0); - - printf("\n\nExtract rootfs? (y/N): "); fflush(stdout); - read(0, &reply, 1); - if (reply=='y'||reply=='Y') { - //rf_extract("/dev/mtd4", 0x000000, 0x6000000, "rootfs.jffs2"); - nanddump("/dev/mtd4", 0x000000, 0, "rootfs.jffs2", 0,0); - } else printf("*** Ignoring rootfs\n"); - - printf("\n\nStrip dumped files? (y/N): "); fflush(stdout); - read(0, &reply, 1); - if (reply=='y'||reply=='Y') { - rf_strip("xloader.bin"); - rf_strip("secondary.bin"); - rf_strip("zImage"); - rf_strip("initfs.jffs2"); - } else printf("*** Ignoring strip\n"); - -/* printf("\nIdentifying extracted files...\n"); - printf("%s: xloader\n", fpid_file("xloader.bin")); - printf("%s: secondary.bin\n", fpid_file("secondary.bin")); - printf("%s: config.bin\n", fpid_file("config.bin")); - printf("%s: zImage\n", fpid_file("zImage")); - printf("%s: initfs.jffs2\n", fpid_file("initfs.jffs2")); - printf("%s: rootfs.jffs2\n", fpid_file("rootfs.jffs2"));*/ - - return 1; -} diff --git a/src/dump.h b/src/dump.h deleted file mode 100644 index 8ce08ec..0000000 --- a/src/dump.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 0xFFFF - Open Free Fiasco Firmware Flasher - * Copyright (C) 2007-2009 pancake - * Copyright (C) 2012 Pali Rohár - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef DUMP_H -#define DUMP_H - -int check_badblocks(char *mtddev); -int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char *dumpfile, int isbl, int ioob); -int dump_config(void); -int reverse_extract_pieces(char *dir); - -#endif -- cgit v1.2.3