diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-05-10 22:39:53 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-05-10 22:39:53 +0000 |
commit | 97599d3e47c3e1af574eb83fbbf4b5d7343c5798 (patch) | |
tree | 36f3d4ed03c02704a1a61f78b40d0b7b7e763aae /firmware | |
parent | e3a2d8647d1688a0b6e47960009294dbdb8bd63c (diff) | |
download | rockbox-97599d3e47c3e1af574eb83fbbf4b5d7343c5798.tar.gz rockbox-97599d3e47c3e1af574eb83fbbf4b5d7343c5798.zip |
This should (hopefully) fix the long-standing RLD problem once and for all.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6452 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/ata.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index e303a8b946..c8ad3b3151 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
@@ -570,7 +570,7 @@ int ata_read_sectors(IF_MV2(int drive,) | |||
570 | 570 | ||
571 | We choose alternative 2. | 571 | We choose alternative 2. |
572 | */ | 572 | */ |
573 | ata_soft_reset(); | 573 | perform_soft_reset(); |
574 | ret = -4; | 574 | ret = -4; |
575 | goto retry; | 575 | goto retry; |
576 | } | 576 | } |
@@ -605,11 +605,11 @@ int ata_read_sectors(IF_MV2(int drive,) | |||
605 | -- ATA specification | 605 | -- ATA specification |
606 | */ | 606 | */ |
607 | if ( status & (STATUS_BSY | STATUS_ERR | STATUS_DF) ) { | 607 | if ( status & (STATUS_BSY | STATUS_ERR | STATUS_DF) ) { |
608 | ata_soft_reset(); | 608 | perform_soft_reset(); |
609 | ret = -5; | 609 | ret = -5; |
610 | goto retry; | 610 | goto retry; |
611 | } | 611 | } |
612 | 612 | ||
613 | buf += sectors * SECTOR_SIZE; /* Advance one chunk of sectors */ | 613 | buf += sectors * SECTOR_SIZE; /* Advance one chunk of sectors */ |
614 | count -= sectors; | 614 | count -= sectors; |
615 | 615 | ||
@@ -617,7 +617,7 @@ int ata_read_sectors(IF_MV2(int drive,) | |||
617 | } | 617 | } |
618 | 618 | ||
619 | if(!ret && !wait_for_end_of_transfer()) { | 619 | if(!ret && !wait_for_end_of_transfer()) { |
620 | ata_soft_reset(); | 620 | perform_soft_reset(); |
621 | ret = -3; | 621 | ret = -3; |
622 | goto retry; | 622 | goto retry; |
623 | } | 623 | } |