talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with sys/i386/isa/wd.c revision 1.182.

This commit is contained in:
KATO Takenori 1998-12-25 09:05:17 +00:00
parent 3ab80a8e63
commit 0eb3f1fd2f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/pc98/pc98/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * 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: /* TODO:
@ -339,19 +339,29 @@ wdprobe(struct isa_device *dvp)
interface = du->dk_ctrlr / 2; interface = du->dk_ctrlr / 2;
du->dk_interface = interface; du->dk_interface = interface;
#if !defined(DISABLE_PCI_IDE) && (NPCI > 0) #if !defined(DISABLE_PCI_IDE) && (NPCI > 0)
if (wddma[interface].wdd_candma) { #ifdef ALI_V
du->dk_dmacookie = wddma[interface].wdd_candma(dvp->id_iobase, du->dk_ctrlr); 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_port = dvp->id_iobase;
du->dk_altport = wddma[interface].wdd_altiobase(du->dk_dmacookie); du->dk_altport = wddma[interface].wdd_altiobase(du->dk_dmacookie);
} else { } else {
du->dk_port = dvp->id_iobase; du->dk_port = dvp->id_iobase;
du->dk_altport = du->dk_port + wd_ctlr; 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 #else
du->dk_port = dvp->id_iobase; du->dk_port = dvp->id_iobase;
du->dk_altport = du->dk_port + wd_ctlr; du->dk_altport = du->dk_port + wd_ctlr;
#endif #endif
/* check if we have registers that work */ /* check if we have registers that work */
#ifdef PC98 #ifdef PC98
/* XXX ATAPI support isn't imported */ /* XXX ATAPI support isn't imported */