diff options
| author |   dlg <dlg@openbsd.org> | 2006-11-28 23:59:45 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2006-11-28 23:59:45 +0000 |
| commit | 73d09fc56bd87109cdbe2d90369b3c6a93a5e94e (patch) | |
| tree | 489a1b920e2f327a4553184e9dddca9852de0863 /sys/dev/isa/aha.c | |
| parent | I just don't know why I decided to set block count to 512 unconditionaly (diff) | |
| download | wireguard-openbsd-73d09fc56bd87109cdbe2d90369b3c6a93a5e94e.tar.xz wireguard-openbsd-73d09fc56bd87109cdbe2d90369b3c6a93a5e94e.zip | |
give scsi controllers a real attach args to fill in when attaching scsibus.
ok miod@ marco@ deraadt@
Diffstat (limited to 'sys/dev/isa/aha.c')
| -rw-r--r-- | sys/dev/isa/aha.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 3167d419773..11213ef4a07 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.55 2005/12/03 17:13:22 krw Exp $ */ +/* $OpenBSD: aha.c,v 1.56 2006/11/28 23:59:45 dlg Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -377,6 +377,7 @@ ahaattach(parent, self, aux) { struct isa_attach_args *ia = aux; struct aha_softc *sc = (void *)self; + struct scsibus_attach_args saa; int isapnp = !strcmp(parent->dv_cfdata->cf_driver->cd_name, "isapnp"); if (isapnp) { @@ -406,13 +407,16 @@ ahaattach(parent, self, aux) sc->sc_link.device = &aha_dev; sc->sc_link.openings = 2; + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; + sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE, IPL_BIO, ahaintr, sc, sc->sc_dev.dv_xname); /* * ask the adapter what subunits are present */ - config_found(self, &sc->sc_link, scsiprint); + config_found(self, &saa, scsiprint); } void |