diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-11-28 23:59:46 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-11-28 23:59:46 +0000 |
| commit | 2612706dbdedc47a09b3d55694e5a0ae45da5431 (patch) | |
| tree | 660420649bfaaad7808081141f49f2a2b02c6c03 /sys/dev/i2o | |
| parent | 056871ecd9a3940fddb99394529c31947383b338 (diff) | |
give scsi controllers a real attach args to fill in when attaching scsibus.
ok miod@ marco@ deraadt@
Diffstat (limited to 'sys/dev/i2o')
| -rw-r--r-- | sys/dev/i2o/ioprbs.c | 8 | ||||
| -rw-r--r-- | sys/dev/i2o/iopsp.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/i2o/ioprbs.c b/sys/dev/i2o/ioprbs.c index f4fb924c710..d9f619ad820 100644 --- a/sys/dev/i2o/ioprbs.c +++ b/sys/dev/i2o/ioprbs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioprbs.c,v 1.10 2005/12/04 04:05:25 krw Exp $ */ +/* $OpenBSD: ioprbs.c,v 1.11 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -179,6 +179,7 @@ ioprbs_attach(struct device *parent, struct device *self, void *aux) struct iop_attach_args *ia = aux; struct ioprbs_softc *sc = (struct ioprbs_softc *)self; struct iop_softc *iop = (struct iop_softc *)parent; + struct scsibus_attach_args saa; int rv, state = 0; int enable; u_int32_t cachesz; @@ -357,7 +358,10 @@ ioprbs_attach(struct device *parent, struct device *self, void *aux) sc->sc_link.adapter_buswidth = 1; sc->sc_link.adapter_target = 1; - config_found(&sc->sc_dv, &sc->sc_link, scsiprint); + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; + + config_found(&sc->sc_dv, &saa, scsiprint); return; diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c index 4fc885728a7..4604bd2a94b 100644 --- a/sys/dev/i2o/iopsp.c +++ b/sys/dev/i2o/iopsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iopsp.c,v 1.8 2005/11/19 02:18:00 pedro Exp $ */ +/* $OpenBSD: iopsp.c,v 1.9 2006/11/28 23:59:45 dlg Exp $ */ /* $NetBSD$ */ /*- @@ -136,6 +136,7 @@ iopsp_attach(struct device *parent, struct device *self, void *aux) struct iop_softc *iop = (struct iop_softc *)parent; struct iopsp_softc *sc = (struct iopsp_softc *)self; struct iop_attach_args *ia = (struct iop_attach_args *)aux; + struct scsibus_attach_args saa; struct { struct i2o_param_op_results pr; struct i2o_param_read_results prr; @@ -217,7 +218,10 @@ iopsp_attach(struct device *parent, struct device *self, void *aux) goto bad; } - config_found(&sc->sc_dv, &sc->sc_link, scsiprint); + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; + + config_found(&sc->sc_dv, &saa, scsiprint); return; bad: |