diff options
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r-- | sys/arch/mvme68k/dev/sshdma.c | 9 | ||||
-rw-r--r-- | sys/arch/mvme68k/dev/vsdma.c | 7 | ||||
-rw-r--r-- | sys/arch/mvme68k/dev/wdsc.c | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/sys/arch/mvme68k/dev/sshdma.c b/sys/arch/mvme68k/dev/sshdma.c index 69f66c71054..e1dc51c78d1 100644 --- a/sys/arch/mvme68k/dev/sshdma.c +++ b/sys/arch/mvme68k/dev/sshdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshdma.c,v 1.13 2006/03/15 20:20:40 miod Exp $ */ +/* $OpenBSD: sshdma.c,v 1.14 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -102,6 +102,7 @@ void *auxp; { struct ssh_softc *sc = (struct ssh_softc *)self; struct confargs *ca = auxp; + struct scsibus_attach_args saa; ssh_regmap_p rp; int tmp; extern int cpuspeed; @@ -176,7 +177,11 @@ void *auxp; tmp = bootpart; if (ca->ca_paddr != bootaddr) bootpart = -1; /* invalid flag to device_register */ - config_found(self, &sc->sc_link, scsiprint); + + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; + + config_found(self, &saa, scsiprint); bootpart = tmp; /* restore old value */ } diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c index 4b9b6100502..808d09f92a7 100644 --- a/sys/arch/mvme68k/dev/vsdma.c +++ b/sys/arch/mvme68k/dev/vsdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsdma.c,v 1.11 2006/03/15 20:20:40 miod Exp $ */ +/* $OpenBSD: vsdma.c,v 1.12 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -98,6 +98,7 @@ vsattach(parent, self, auxp) { struct vs_softc *sc = (struct vs_softc *)self; struct confargs *ca = auxp; + struct scsibus_attach_args saa; struct vsreg * rp; int tmp; @@ -133,10 +134,12 @@ vsattach(parent, self, auxp) * attach all scsi units on us, watching for boot device * (see device_register). */ + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; tmp = bootpart; if (ca->ca_paddr != bootaddr) bootpart = -1; /* invalid flag to device_register */ - config_found(self, &sc->sc_link, scsiprint); + config_found(self, &saa, scsiprint); bootpart = tmp; /* restore old value */ } diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c index d3a6148535b..df168eae59f 100644 --- a/sys/arch/mvme68k/dev/wdsc.c +++ b/sys/arch/mvme68k/dev/wdsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdsc.c,v 1.13 2006/04/22 11:37:06 miod Exp $ */ +/* $OpenBSD: wdsc.c,v 1.14 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 1996 Steve Woodford @@ -112,6 +112,7 @@ wdscattach(parent, self, aux) { struct sbic_softc *sc = (struct sbic_softc *)self; struct confargs *ca = aux; + struct scsibus_attach_args saa; int tmp; sc->sc_enintr = wdsc_enintr; @@ -171,10 +172,13 @@ wdscattach(parent, self, aux) * Attach all scsi units on us, watching for boot device * (see device_register). */ + bzero(&saa, sizeof(saa)); + saa.saa_sc_link = &sc->sc_link; + tmp = bootpart; if (ca->ca_paddr != bootaddr) bootpart = -1; - config_found(self, &sc->sc_link, scsiprint); + config_found(self, &saa, scsiprint); bootpart = tmp; /* restore old value */ } |