diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/ffspart/ffspart.c | 10 | ||||
| -rw-r--r-- | external/ffspart/test/files/03-tiny-pnor.in | 8 | ||||
| -rw-r--r-- | external/ffspart/test/files/03-tiny-pnor.out | bin | 2560 -> 2560 bytes | |||
| -rw-r--r-- | external/ffspart/test/files/03.1-tiny-pnor-backup.in | 8 | ||||
| -rw-r--r-- | external/ffspart/test/files/03.1-tiny-pnor-backup.out | bin | 2864 -> 3840 bytes | |||
| -rw-r--r-- | external/ffspart/test/files/04-tiny-pnor2.out | bin | 2560 -> 2560 bytes | |||
| -rw-r--r-- | external/ffspart/test/results/05-hdr-overlap.err | 4 | ||||
| -rw-r--r-- | external/ffspart/test/results/05-hdr-overlap.out | 1 | ||||
| -rw-r--r-- | external/ffspart/test/results/05.1-hdr-overlap-backup.err | 4 | ||||
| -rw-r--r-- | external/ffspart/test/tests/03.1-tiny-pnor-backup | 2 |
10 files changed, 15 insertions, 22 deletions
diff --git a/external/ffspart/ffspart.c b/external/ffspart/ffspart.c index 50b5861..7703477 100644 --- a/external/ffspart/ffspart.c +++ b/external/ffspart/ffspart.c @@ -174,17 +174,11 @@ int main(int argc, char *argv[]) goto out; } - /* - * TODO: Rethink, is ffspart providing a variable TOC size useful? - * Use 1 block for the size of the partition table... - */ - rc = ffs_hdr_new(block_size, block_size, block_count / sides, &new_hdr); + rc = ffs_hdr_new(block_size, block_count / sides, &new_hdr); if (rc) { if (rc == FFS_ERR_BAD_SIZE) { /* Well this check is a tad redudant now */ - fprintf(stderr, "Bad size parametres passed to libffs: " - "size must be a multiple of block_size\n" - "size (%u), block_size (%u) \n", block_size, block_size); + fprintf(stderr, "Bad parametres passed to libffs\n"); } else { fprintf(stderr, "Error %d initialising new TOC\n", rc); } diff --git a/external/ffspart/test/files/03-tiny-pnor.in b/external/ffspart/test/files/03-tiny-pnor.in index 517dc47..3c02b02 100644 --- a/external/ffspart/test/files/03-tiny-pnor.in +++ b/external/ffspart/test/files/03-tiny-pnor.in @@ -1,4 +1,4 @@ -ONE,0x00000300,0x00000100,EV,/dev/zero -TWO,0x00000400,0x00000100,EF,/dev/zero -THREE,0x00000500,0x00000100,EF,/dev/zero -FOUR,0x00000600,0x00000100,EF,/dev/zero +ONE,0x00400,0x00000100,EV,/dev/zero +TWO,0x00500,0x00000100,EF,/dev/zero +THREE,0x600,0x00000100,EF,/dev/zero +FOUR,0x0700,0x00000100,EF,/dev/zero diff --git a/external/ffspart/test/files/03-tiny-pnor.out b/external/ffspart/test/files/03-tiny-pnor.out Binary files differindex 32e998d..e00fa5c 100644 --- a/external/ffspart/test/files/03-tiny-pnor.out +++ b/external/ffspart/test/files/03-tiny-pnor.out diff --git a/external/ffspart/test/files/03.1-tiny-pnor-backup.in b/external/ffspart/test/files/03.1-tiny-pnor-backup.in index 517dc47..b552750 100644 --- a/external/ffspart/test/files/03.1-tiny-pnor-backup.in +++ b/external/ffspart/test/files/03.1-tiny-pnor-backup.in @@ -1,4 +1,4 @@ -ONE,0x00000300,0x00000100,EV,/dev/zero -TWO,0x00000400,0x00000100,EF,/dev/zero -THREE,0x00000500,0x00000100,EF,/dev/zero -FOUR,0x00000600,0x00000100,EF,/dev/zero +ONE,0x00400,0x100,EV,/dev/zero +TWO,0x00500,0x100,EF,/dev/zero +THREE,0x600,0x100,EF,/dev/zero +FOUR,0x0700,0x100,EF,/dev/zero diff --git a/external/ffspart/test/files/03.1-tiny-pnor-backup.out b/external/ffspart/test/files/03.1-tiny-pnor-backup.out Binary files differindex 85c23e3..e173e9e 100644 --- a/external/ffspart/test/files/03.1-tiny-pnor-backup.out +++ b/external/ffspart/test/files/03.1-tiny-pnor-backup.out diff --git a/external/ffspart/test/files/04-tiny-pnor2.out b/external/ffspart/test/files/04-tiny-pnor2.out Binary files differindex dad94b8..394edf0 100644 --- a/external/ffspart/test/files/04-tiny-pnor2.out +++ b/external/ffspart/test/files/04-tiny-pnor2.out diff --git a/external/ffspart/test/results/05-hdr-overlap.err b/external/ffspart/test/results/05-hdr-overlap.err index c0ab238..55f07c6 100644 --- a/external/ffspart/test/results/05-hdr-overlap.err +++ b/external/ffspart/test/results/05-hdr-overlap.err @@ -1,2 +1,2 @@ -Adding partition 'FOUR' would cause partition 'ONE' at 0x00000200 to overlap with the header -Couldn't add entry 'FOUR' 0x00000500 for 0x00000100 +Adding partition 'THREE' would cause partition 'ONE' at 0x00000200 to overlap with the header +Couldn't add entry 'THREE' 0x00000400 for 0x00000100 diff --git a/external/ffspart/test/results/05-hdr-overlap.out b/external/ffspart/test/results/05-hdr-overlap.out index 9613697..dbcdcb1 100644 --- a/external/ffspart/test/results/05-hdr-overlap.out +++ b/external/ffspart/test/results/05-hdr-overlap.out @@ -1,5 +1,4 @@ Adding 'ONE' 0x00000200, 0x00000100 Adding 'TWO' 0x00000300, 0x00000100 Adding 'THREE' 0x00000400, 0x00000100 -Adding 'FOUR' 0x00000500, 0x00000100 Freeing hdr diff --git a/external/ffspart/test/results/05.1-hdr-overlap-backup.err b/external/ffspart/test/results/05.1-hdr-overlap-backup.err index 2adbf79..55f07c6 100644 --- a/external/ffspart/test/results/05.1-hdr-overlap-backup.err +++ b/external/ffspart/test/results/05.1-hdr-overlap-backup.err @@ -1,2 +1,2 @@ -Adding partition 'BACKUP_PART' would cause partition 'ONE' at 0x00000200 to overlap with the header -Failed to create backup part +Adding partition 'THREE' would cause partition 'ONE' at 0x00000200 to overlap with the header +Couldn't add entry 'THREE' 0x00000400 for 0x00000100 diff --git a/external/ffspart/test/tests/03.1-tiny-pnor-backup b/external/ffspart/test/tests/03.1-tiny-pnor-backup index a622ca6..3065c86 100644 --- a/external/ffspart/test/tests/03.1-tiny-pnor-backup +++ b/external/ffspart/test/tests/03.1-tiny-pnor-backup @@ -2,7 +2,7 @@ touch $DATA_DIR/$CUR_TEST.gen -run_binary "./ffspart" "-b -s 0x100 -c 10 -i $DATA_DIR/$CUR_TEST.in -p $DATA_DIR/$CUR_TEST.gen" +run_binary "./ffspart" "-b -s 0x100 -c 15 -i $DATA_DIR/$CUR_TEST.in -p $DATA_DIR/$CUR_TEST.gen" if [ "$?" -ne 0 ] ; then fail_test fi |