devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fixed lame timeout handling and wrong return codes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@508 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-05-08 08:27:44 +00:00
parent 3d05c6301a
commit b900a83046
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/drivers/ata.c
View file

@ -32,7 +32,7 @@
#define ATA_HCYL (*((volatile unsigned char*)0x06100105)) #define ATA_HCYL (*((volatile unsigned char*)0x06100105))
#define ATA_SELECT (*((volatile unsigned char*)0x06100106)) #define ATA_SELECT (*((volatile unsigned char*)0x06100106))
#define ATA_COMMAND (*((volatile unsigned char*)0x06100107)) #define ATA_COMMAND (*((volatile unsigned char*)0x06100107))
#define ATA_STATUS ATA_COMMAND #define ATA_STATUS (*((volatile unsigned char*)0x06100107))
#define ATA_CONTROL (*((volatile unsigned char*)0x06200306)) #define ATA_CONTROL (*((volatile unsigned char*)0x06200306))
#define ATA_ALT_STATUS ATA_CONTROL #define ATA_ALT_STATUS ATA_CONTROL
@ -55,7 +55,7 @@
static int wait_for_bsy(void) static int wait_for_bsy(void)
{ {
char timeout = current_tick + HZ; int timeout = current_tick + HZ*4;
while (TIME_BEFORE(current_tick, timeout) && (ATA_ALT_STATUS & STATUS_BSY)) while (TIME_BEFORE(current_tick, timeout) && (ATA_ALT_STATUS & STATUS_BSY))
yield(); yield();
@ -96,9 +96,12 @@ int ata_read_sectors(unsigned long start,
{ {
int i; int i;
if (!wait_for_rdy()) DEBUGF("ata: ata_read_sectors(%d, %d)\n", start, count);
return 0;
if (!wait_for_rdy())
return -1;
DEBUGF("ata: reading sector %d\n", start);
led(TRUE); led(TRUE);
ATA_NSECTOR = count; ATA_NSECTOR = count;
@ -111,7 +114,7 @@ int ata_read_sectors(unsigned long start,
for (i=0; i<count; i++) { for (i=0; i<count; i++) {
int j; int j;
if (!wait_for_start_of_transfer()) if (!wait_for_start_of_transfer())
return 0; return -1;
for (j=0; j<256; j++) for (j=0; j<256; j++)
((unsigned short*)buf)[j] = SWAB16(ATA_DATA); ((unsigned short*)buf)[j] = SWAB16(ATA_DATA);
@ -124,7 +127,10 @@ int ata_read_sectors(unsigned long start,
led(FALSE); led(FALSE);
return wait_for_end_of_transfer(); if(!wait_for_end_of_transfer())
return -1;
else
return 0;
} }
#ifdef DISK_WRITE #ifdef DISK_WRITE