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

ATA io_address_detect() now doesn't probe any more, but uses the h/w mask. Probing failed for some flash users. I hope this works for everybody, we have to try to find out.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3946 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jörg Hohensohn 2003-09-01 05:48:42 +00:00
parent 20b61a2e88
commit 118d45eb92
1 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

37
firmware/drivers/ata.c
View file

@ -28,6 +28,7 @@
#include "usb.h" #include "usb.h"
#include "power.h" #include "power.h"
#include "string.h" #include "string.h"
#include "hwcompat.h"
#define SECTOR_SIZE 512 #define SECTOR_SIZE 512
#define ATA_DATA (*((volatile unsigned short*)0x06104100)) #define ATA_DATA (*((volatile unsigned short*)0x06104100))
@ -697,42 +698,20 @@ static int master_slave_detect(void)
} }
static int io_address_detect(void) static int io_address_detect(void)
{ { /* now, use the HW mask instead of probing */
unsigned char tmp = ATA_STATUS & 0xf9; /* Mask the IDX and CORR bits */ if (read_hw_mask() & ATA_ADDRESS_200)
unsigned char dummy;
/* We compare the STATUS register with the ALT_STATUS register, which
is located at the same address as CONTROL. If they are the same, we
assume that we have the correct address.
We can't read the ATA_STATUS directly, since the read data will stay
on the data bus if the following read does not assert the Chip Select
to the ATA controller. We read a register that we know exists to make
sure that the data on the bus isn't identical to the STATUS register
contents. */
ATA_SECTOR = 0;
dummy = ATA_SECTOR;
if(tmp == ((*ATA_CONTROL2) & 0xf9))
{ {
DEBUGF("CONTROL is at 0x306\n");
ata_io_address = 0x300; /* For debug purposes only */
old_recorder = true;
ata_control = ATA_CONTROL2;
}
else
{
DEBUGF("CONTROL is at 0x206\n");
ata_io_address = 0x200; /* For debug purposes only */ ata_io_address = 0x200; /* For debug purposes only */
old_recorder = false; old_recorder = false;
ata_control = ATA_CONTROL1; ata_control = ATA_CONTROL1;
} }
else
/* Let's check again, to be sure */
if(tmp != (ATA_ALT_STATUS & 0xf9))
{ {
DEBUGF("ATA I/O address detection failed\n"); ata_io_address = 0x300; /* For debug purposes only */
return -1; old_recorder = true;
ata_control = ATA_CONTROL2;
} }
return 0; return 0;
} }