diff options
| author | kato <kato@FreeBSD.org> | 1998-12-25 09:05:17 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-12-25 09:05:17 +0000 |
| commit | 2b62056e5e0e94560fce9ea0809ed25d2447c27f (patch) | |
| tree | 932550c8fd068e377166a114a2bf9fec801a709e /sys | |
| parent | 208dec27b472cc1c9f41ba1fedf7495ce098bb0b (diff) | |
| download | FreeBSD-src-2b62056e5e0e94560fce9ea0809ed25d2447c27f.zip FreeBSD-src-2b62056e5e0e94560fce9ea0809ed25d2447c27f.tar.gz | |
Sync with sys/i386/isa/wd.c revision 1.182.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/pc98/wd.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 7efaf8d..e4648d6 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.66 1998/11/16 08:13:54 kato Exp $ + * $Id: wd.c,v 1.67 1998/12/17 08:42:10 kato Exp $ */ /* TODO: @@ -339,19 +339,29 @@ wdprobe(struct isa_device *dvp) interface = du->dk_ctrlr / 2; du->dk_interface = interface; #if !defined(DISABLE_PCI_IDE) && (NPCI > 0) - if (wddma[interface].wdd_candma) { - du->dk_dmacookie = wddma[interface].wdd_candma(dvp->id_iobase, du->dk_ctrlr); +#ifdef ALI_V + if ((wddma[interface].wdd_candma) && + ((du->dk_dmacookie = wddma[interface].wdd_candma(dvp->id_iobase,du->dk_ctrlr)) != NULL)) + { du->dk_port = dvp->id_iobase; du->dk_altport = wddma[interface].wdd_altiobase(du->dk_dmacookie); } else { du->dk_port = dvp->id_iobase; du->dk_altport = du->dk_port + wd_ctlr; } +#endif + if (wddma[interface].wdd_candma) { + du->dk_dmacookie = wddma[interface].wdd_candma(dvp->id_iobase,du->dk_ctrlr); + du->dk_port = dvp->id_iobase; + du->dk_altport = wddma[interface].wdd_altiobase(du->dk_dmacookie); + } else { + du->dk_port = dvp->id_iobase; + du->dk_altport = du->dk_port + wd_ctlr; + } #else du->dk_port = dvp->id_iobase; du->dk_altport = du->dk_port + wd_ctlr; #endif - /* check if we have registers that work */ #ifdef PC98 /* XXX ATAPI support isn't imported */ |
