diff options
| author | grehan <grehan@FreeBSD.org> | 2005-04-20 02:26:31 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2005-04-20 02:26:31 +0000 |
| commit | 708e4e1098efcd683e87c7bb56cbfb45e69ec88a (patch) | |
| tree | 4ad3711c862b6d544164deb3355efe768c32f480 /sys/powerpc | |
| parent | c67b019336c570d65b0b274141b21ea9cbb654ae (diff) | |
| download | FreeBSD-src-708e4e1098efcd683e87c7bb56cbfb45e69ec88a.zip FreeBSD-src-708e4e1098efcd683e87c7bb56cbfb45e69ec88a.tar.gz | |
Get order right when initializing task file bus resources. ATA drives are
now recognised when booting from the drive, as opposed to net-booting which
the previous botched commit was tested with.
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/powermac/ata_kauai.c | 4 | ||||
| -rw-r--r-- | sys/powerpc/powermac/ata_macio.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c index 85b0daf..677e912 100644 --- a/sys/powerpc/powermac/ata_kauai.c +++ b/sys/powerpc/powermac/ata_kauai.c @@ -177,9 +177,9 @@ ata_kauai_probe(device_t dev) ch->r_io[i].res = mem; ch->r_io[i].offset = i*ATA_KAUAI_REGGAP + ATA_KAUAI_REGOFFSET; } + ch->r_io[ATA_CONTROL].res = mem; + ch->r_io[ATA_CONTROL].offset = ATA_KAUAI_ALTOFFSET; ata_default_registers(ch); - ch->r_io[ATA_ALTSTAT].res = mem; - ch->r_io[ATA_ALTSTAT].offset = ATA_KAUAI_ALTOFFSET; ch->unit = 0; ch->flags |= ATA_USE_16BIT|ATA_NO_SLAVE; diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c index 1bf464e..5d91c3a 100644 --- a/sys/powerpc/powermac/ata_macio.c +++ b/sys/powerpc/powermac/ata_macio.c @@ -114,9 +114,9 @@ ata_macio_probe(device_t dev) ch->r_io[i].res = mem; ch->r_io[i].offset = i * ATA_MACIO_REGGAP; } + ch->r_io[ATA_CONTROL].res = mem; + ch->r_io[ATA_CONTROL].offset = ATA_MACIO_ALTOFFSET; ata_default_registers(ch); - ch->r_io[ATA_ALTSTAT].res = mem; - ch->r_io[ATA_ALTSTAT].offset = ATA_MACIO_ALTOFFSET; ch->unit = 0; ch->flags |= ATA_USE_16BIT; |
