diff options
| author | grehan <grehan@FreeBSD.org> | 2003-02-24 03:12:30 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2003-02-24 03:12:30 +0000 |
| commit | 47fb20d3f1af57029620287ba13545c28f628e8a (patch) | |
| tree | fab0f26ba5dcb539865afce0948287c2e033eb96 /sys/powerpc/powermac | |
| parent | 9590f548c31736b4af7fcb7aec15be91a9626295 (diff) | |
| download | FreeBSD-src-47fb20d3f1af57029620287ba13545c28f628e8a.zip FreeBSD-src-47fb20d3f1af57029620287ba13545c28f628e8a.tar.gz | |
Catch up with ATAng changes
Diffstat (limited to 'sys/powerpc/powermac')
| -rw-r--r-- | sys/powerpc/powermac/ata_macio.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c index cc2e7fb..54eb8e0 100644 --- a/sys/powerpc/powermac/ata_macio.c +++ b/sys/powerpc/powermac/ata_macio.c @@ -41,6 +41,7 @@ #include <machine/resource.h> #include <machine/bus.h> #include <sys/rman.h> +#include <sys/ata.h> #include <dev/ata/ata-all.h> #include <dev/ofw/openfirm.h> @@ -285,19 +286,18 @@ static driver_t ata_macio_sub_driver = { DRIVER_MODULE(ata, atamacio, ata_macio_sub_driver, ata_devclass, 0, 0); -static int -ata_macio_intrnoop(struct ata_channel *ch) -{ - - return (1); -} - static void ata_macio_locknoop(struct ata_channel *ch, int type) { /* XXX SMP ? */ } +static void +ata_macio_setmode(struct ata_device *atadev, int mode) +{ + atadev->mode = ATA_PIO; +} + static int ata_macio_sub_probe(device_t dev) { @@ -306,9 +306,13 @@ ata_macio_sub_probe(device_t dev) ch = device_get_softc(dev); ch->unit = 0; - ch->flags = ATA_USE_16BIT; - ch->intr_func = ata_macio_intrnoop; - ch->lock_func = ata_macio_locknoop; + ch->flags |= ATA_USE_16BIT; + ch->locking = ata_macio_locknoop; + ch->device[MASTER].setmode = ata_macio_setmode; + ch->device[SLAVE].setmode = ata_macio_setmode; return (ata_probe(dev)); } + + + |
