summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sparmann <theseven@rockbox.org>2010-03-14 17:26:06 +0000
committerMichael Sparmann <theseven@rockbox.org>2010-03-14 17:26:06 +0000
commit3e9222de387df622e014d4792199e50183c7cc73 (patch)
tree7689a6a275e01bc3b4a80275937ea54c3b03712d
parent1a38f380b8fbbcc6e9ff3fc1345f0ffeaed8c59d (diff)
downloadrockbox-3e9222de387df622e014d4792199e50183c7cc73.tar.gz
rockbox-3e9222de387df622e014d4792199e50183c7cc73.zip
Nano2G: switch over to slow writes at VFL level
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25176 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
index 321495a321..9a06fbed86 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
@@ -864,9 +864,7 @@ uint32_t ftl_vfl_read_fast(uint32_t vpage, void* buffer, void* sparebuffer,
864 //return 4; 864 //return 4;
865 865
866 uint32_t bank = abspage % ftl_banks; 866 uint32_t bank = abspage % ftl_banks;
867 uint32_t block = abspage / ((*ftl_nand_type).pagesperblock * ftl_banks); 867// if (bank)
868 uint32_t page = (abspage / ftl_banks) % (*ftl_nand_type).pagesperblock;
869 if (bank)
870 { 868 {
871 for (i = 0; i < ftl_banks; i++) 869 for (i = 0; i < ftl_banks; i++)
872 { 870 {
@@ -882,6 +880,8 @@ uint32_t ftl_vfl_read_fast(uint32_t vpage, void* buffer, void* sparebuffer,
882 } 880 }
883 return rc; 881 return rc;
884 } 882 }
883 uint32_t block = abspage / ((*ftl_nand_type).pagesperblock * ftl_banks);
884 uint32_t page = (abspage / ftl_banks) % (*ftl_nand_type).pagesperblock;
885 uint32_t physblock = ftl_vfl_get_physical_block(bank, block); 885 uint32_t physblock = ftl_vfl_get_physical_block(bank, block);
886 uint32_t physpage = physblock * (*ftl_nand_type).pagesperblock + page; 886 uint32_t physpage = physblock * (*ftl_nand_type).pagesperblock + page;
887 887
@@ -891,7 +891,7 @@ uint32_t ftl_vfl_read_fast(uint32_t vpage, void* buffer, void* sparebuffer,
891 for (i = 0; i < ftl_banks; i++) 891 for (i = 0; i < ftl_banks; i++)
892 { 892 {
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)) & 0xd)
895 { 895 {
896 rc &= ~(0xf << (i << 2)); 896 rc &= ~(0xf << (i << 2));
897 nand_reset(i); 897 nand_reset(i);