len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert Nano2G fast VFL reads for now. They just won't work on some hardware.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25170 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2010-03-14 16:06:54 +00:00
parent c18e80e127
commit 7e4b53892e
2 changed files with 29 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

44
firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
View file

@ -528,20 +528,28 @@ uint32_t nand_read_page_fast(uint32_t page, void* databuffer,
nand_last_activity_value = current_tick;
led(true);
if (!nand_powered) nand_power_up();
for (i = 0; i < 4; i++)
{
if (nand_type[i] == 0xFFFFFFFF) continue;
nand_set_fmctrl0(i, FMCTRL0_ENABLEDMA);
if (nand_send_cmd(NAND_CMD_READ))
{
rc |= 1 << (i << 2);
continue;
}
if (nand_send_address(page, databuffer ? 0 : 0x800))
{
rc |= 1 << (i << 2);
continue;
}
if (nand_send_cmd(NAND_CMD_READ2))
{
rc |= 1 << (i << 2);
continue;
}
}
uint8_t status[4];
for (i = 0; i < 4; i++) status[i] = (nand_type[i] == 0xFFFFFFFF);
if (!status[0])
{
nand_set_fmctrl0(0, FMCTRL0_ENABLEDMA);
if (nand_send_cmd(NAND_CMD_READ))
status[0] = 1;
}
if (!status[0])
if (nand_send_address(page, 0))
status[0] = 1;
if (!status[0])
if (nand_send_cmd(NAND_CMD_READ2))
status[0] = 1;
if (!status[0])
if (nand_wait_status_ready(0))
status[0] = 1;
@ -553,18 +561,6 @@ uint32_t nand_read_page_fast(uint32_t page, void* databuffer,
status[0] = 1;
for (i = 1; i < 4; i++)
{
if (!status[i])
{
nand_set_fmctrl0(i, FMCTRL0_ENABLEDMA);
if (nand_send_cmd(NAND_CMD_READ))
status[i] = 1;
}
if (!status[i])
if (nand_send_address(page, 0))
status[i] = 1;
if (!status[i])
if (nand_send_cmd(NAND_CMD_READ2))
status[i] = 1;
if (!status[i])
if (nand_wait_status_ready(i))
status[i] = 1;