diff options
| author |   matthew <matthew@openbsd.org> | 2011-07-09 00:39:29 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2011-07-09 00:39:29 +0000 |
| commit | c6dcd20d9ad694d0b097b14670801f4be4d99bb8 (patch) | |
| tree | 1bb655537abc4d1872c4534acb376ceb50643969 | |
| parent | Add SCSI_NO_ADAPTER_TARGET as a value for adapters to set (diff) | |
| download | wireguard-openbsd-c6dcd20d9ad694d0b097b14670801f4be4d99bb8.tar.xz wireguard-openbsd-c6dcd20d9ad694d0b097b14670801f4be4d99bb8.zip | |
Kludge around sdmmc(4)'s poor design: replace "struct scsi_link *"
with "struct scsibus_attach_args" in sdmmc_attach_args.
ok krw@
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_scsi.c | 6 | ||||
| -rw-r--r-- | sys/dev/sdmmc/sdmmcvar.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c index 0ec99818580..0cf3ed6d1e5 100644 --- a/sys/dev/sdmmc/sdmmc_scsi.c +++ b/sys/dev/sdmmc/sdmmc_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_scsi.c,v 1.27 2011/06/16 01:09:16 dlg Exp $ */ +/* $OpenBSD: sdmmc_scsi.c,v 1.28 2011/07/09 00:39:29 matthew Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -139,9 +139,9 @@ sdmmc_scsi_attach(struct sdmmc_softc *sc) scbus->sc_link.pool = &scbus->sc_iopool; bzero(&saa, sizeof(saa)); - saa.scsi_link = &scbus->sc_link; + saa.saa.saa_sc_link = &scbus->sc_link; - scbus->sc_child = config_found(&sc->sc_dev, &saa, scsiprint); + scbus->sc_child = config_found(&sc->sc_dev, &saa.saa, scsiprint); if (scbus->sc_child == NULL) { printf("%s: can't attach scsibus\n", sc->sc_dev.dv_xname); goto free_ccbs; diff --git a/sys/dev/sdmmc/sdmmcvar.h b/sys/dev/sdmmc/sdmmcvar.h index 3b59d39fc8a..a3960a09f47 100644 --- a/sys/dev/sdmmc/sdmmcvar.h +++ b/sys/dev/sdmmc/sdmmcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmcvar.h,v 1.18 2010/08/24 14:52:23 blambert Exp $ */ +/* $OpenBSD: sdmmcvar.h,v 1.19 2011/07/09 00:39:29 matthew Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -182,7 +182,7 @@ struct sdmmc_softc { * Attach devices at the sdmmc bus. */ struct sdmmc_attach_args { - struct scsi_link *scsi_link; /* XXX */ + struct scsibus_attach_args saa; /* XXX */ struct sdmmc_function *sf; }; |