d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring to working PIO state.

Browse Source 
- use correct rid when allocating PCI mem resource
 - ATA taskfile registers are indeed spaced 0x10 apart just like
 the Macio ATA cell. Adjust offsets in ATA channel struct.

Tested by:  Suleiman Souhlal <ssouhlal@vt.edu>
This commit is contained in:
Peter Grehan 2004-02-29 06:01:16 +00:00
parent 77990834a3
commit 80bd99be33
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/powerpc/powermac/ata_kauai.c
View File

@ -54,7 +54,16 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#define ATA_KAUAI_REGOFFSET 0x2000
#define ATA_KAUAI_ALTOFFSET (ATA_KAUAI_REGOFFSET + 0x16)
/*
* Offset to alt-control register from base
*/
#define ATA_KAUAI_ALTOFFSET (ATA_KAUAI_REGOFFSET + 0x160)
/*
* Define the gap between registers
*/
#define ATA_KAUAI_REGGAP 16
/*
* Define the kauai pci bus attachment.
@ -161,7 +170,7 @@ ata_kauai_probe(device_t dev)
ch = device_get_softc(dev);
rid = 0;
rid = PCIR_BARS;
mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~1, 1,
RF_ACTIVE);
if (mem == NULL) {
@ -174,7 +183,7 @@ ata_kauai_probe(device_t dev)
*/
for (i = ATA_DATA; i <= ATA_STATUS; i++) {
ch->r_io[i].res = mem;
ch->r_io[i].offset = i + ATA_KAUAI_REGOFFSET;
ch->r_io[i].offset = i*ATA_KAUAI_REGGAP + ATA_KAUAI_REGOFFSET;
}
ch->r_io[ATA_ALTSTAT].res = mem;
ch->r_io[ATA_ALTSTAT].offset = ATA_KAUAI_ALTOFFSET;