diff options
author | Michael Sparmann <theseven@rockbox.org> | 2010-03-14 15:12:08 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2010-03-14 15:12:08 +0000 |
commit | 884147c5e225af3cce71900e47ce70abd260dfd5 (patch) | |
tree | ad9d64dc156b2eb4880c0d84574e988f7185519d /firmware | |
parent | a0692a40b238669059822f1af0bb11a1c9d20639 (diff) | |
download | rockbox-884147c5e225af3cce71900e47ce70abd260dfd5.tar.gz rockbox-884147c5e225af3cce71900e47ce70abd260dfd5.zip |
Nano 2G VFL: try slow read twice if fast read failed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25166 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c index 9bac47e5bb..b5f179ce89 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | |||
@@ -893,20 +893,27 @@ uint32_t ftl_vfl_read_fast(uint32_t vpage, void* buffer, void* sparebuffer, | |||
893 | if ((rc >> (i << 2)) & 0x2) continue; | 893 | if ((rc >> (i << 2)) & 0x2) continue; |
894 | if ((rc >> (i << 2)) & 0xf) | 894 | if ((rc >> (i << 2)) & 0xf) |
895 | { | 895 | { |
896 | rc &= ~(0xf << (i << 2)); | ||
897 | nand_reset(i); | 896 | nand_reset(i); |
898 | uint32_t ret = nand_read_page(i, physpage, | 897 | uint32_t ret = nand_read_page(i, physpage, |
899 | (void*)((uint32_t)buffer + 0x800 * i), | 898 | (void*)((uint32_t)buffer + 0x800 * i), |
900 | (void*)((uint32_t)sparebuffer + 0x40 * i), | 899 | (void*)((uint32_t)sparebuffer + 0x40 * i), |
901 | 1, checkempty); | 900 | 1, checkempty); |
901 | if ((ret & 0x11D) != 0 && (ret & 2) == 0) | ||
902 | { | ||
903 | ret = nand_read_page(i, physpage, | ||
904 | (void*)((uint32_t)buffer + 0x800 * i), | ||
905 | (void*)((uint32_t)sparebuffer + 0x40 * i), | ||
906 | 1, checkempty); | ||
902 | #ifdef FTL_READONLY | 907 | #ifdef FTL_READONLY |
903 | (void)remaponfail; | 908 | (void)remaponfail; |
904 | #else | 909 | #else |
905 | if (remaponfail == 1 && (ret & 0x11D) != 0 && (ret & 2) == 0) | 910 | if (remaponfail == 1 && (ret & 0x11D) != 0 && (ret & 2) == 0) |
906 | panicf("FTL: VFL fast read failed, RC %04X, bank %d, RET %03X, base %d", | 911 | panicf("FTL: VFL fast read failed, RC %04X, bank %d, RET %03X, base %d", |
907 | rc, i, ret, vpage); | 912 | rc, i, ret, vpage); |
908 | // ftl_vfl_schedule_block_for_remap(i, block); | 913 | // ftl_vfl_schedule_block_for_remap(i, block); |
909 | #endif | 914 | #endif |
915 | } | ||
916 | rc &= ~(0xf << (i << 2)); | ||
910 | if (ret & 1) rc |= 1 << (i << 2); | 917 | if (ret & 1) rc |= 1 << (i << 2); |
911 | if (ret & 2) rc |= 2 << (i << 2); | 918 | if (ret & 2) rc |= 2 << (i << 2); |
912 | if (ret & 0x10) rc |= 4 << (i << 2); | 919 | if (ret & 0x10) rc |= 4 << (i << 2); |