len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-22 11:32:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nano2G NAND: Don't continue reading on that bank if starting the read failed.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25182 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2010-03-14 20:55:43 +00:00
parent af38e0960b
commit 9b416c0652
1 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -530,28 +530,23 @@ uint32_t nand_read_page_fast(uint32_t page, void* databuffer,
nand_last_activity_value = current_tick; nand_last_activity_value = current_tick;
led(true); led(true);
if (!nand_powered) nand_power_up(); 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]; uint8_t status[4];
for (i = 0; i < 4; i++) status[i] = (nand_type[i] == 0xFFFFFFFF); for (i = 0; i < 4; i++) status[i] = (nand_type[i] == 0xFFFFFFFF);
for (i = 0; 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[0]) if (!status[0])
if (nand_wait_status_ready(0)) if (nand_wait_status_ready(0))
status[0] = 1; status[0] = 1;