summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2005-04-18 04:23:23 +0000
committergrehan <grehan@FreeBSD.org>2005-04-18 04:23:23 +0000
commit4e527f862b15e98405d2811edb0b46dd7707bd85 (patch)
tree9bb411570dab02ab92e43ed768c786af266b87ae
parent3460f32839934dda4bd0da0981978701a43bfe2a (diff)
downloadFreeBSD-src-4e527f862b15e98405d2811edb0b46dd7707bd85.zip
FreeBSD-src-4e527f862b15e98405d2811edb0b46dd7707bd85.tar.gz
Catch up with ATA mkIII definitions for registers that have different
functions for read vs. write.
-rw-r--r--sys/powerpc/powermac/ata_kauai.c3
-rw-r--r--sys/powerpc/powermac/ata_macio.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index 4c03de7..85b0daf 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -173,10 +173,11 @@ ata_kauai_probe(device_t dev)
/*
* Set up the resource vectors
*/
- for (i = ATA_DATA; i <= ATA_STATUS; i++) {
+ for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
ch->r_io[i].res = mem;
ch->r_io[i].offset = i*ATA_KAUAI_REGGAP + ATA_KAUAI_REGOFFSET;
}
+ ata_default_registers(ch);
ch->r_io[ATA_ALTSTAT].res = mem;
ch->r_io[ATA_ALTSTAT].offset = ATA_KAUAI_ALTOFFSET;
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c
index 3375dac..1bf464e 100644
--- a/sys/powerpc/powermac/ata_macio.c
+++ b/sys/powerpc/powermac/ata_macio.c
@@ -110,10 +110,11 @@ ata_macio_probe(device_t dev)
/*
* Set up the resource vectors
*/
- for (i = ATA_DATA; i <= ATA_STATUS; i++) {
+ for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
ch->r_io[i].res = mem;
ch->r_io[i].offset = i * ATA_MACIO_REGGAP;
}
+ ata_default_registers(ch);
ch->r_io[ATA_ALTSTAT].res = mem;
ch->r_io[ATA_ALTSTAT].offset = ATA_MACIO_ALTOFFSET;
OpenPOWER on IntegriCloud