diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-05 21:54:45 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-05 21:54:45 +0000 |
commit | 1f0284c067ef226102b1e4242b22723452a7d176 (patch) | |
tree | 86bf538e483adb655df463be085a7d0d9b85183d /sys | |
parent | 067eabbf4984c91b28385d09782c42e320a45b0c (diff) |
Double checking you committed the correct diff sometimes pays
off. Sigh.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/eisa/ahc_eisa.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.c | 18 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.h | 4 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxxvar.h | 8 | ||||
-rw-r--r-- | sys/dev/ic/qlw.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/ahc_pci.c | 6 |
6 files changed, 23 insertions, 23 deletions
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c index f658eac26aa..8e68935deb9 100644 --- a/sys/dev/eisa/ahc_eisa.c +++ b/sys/dev/eisa/ahc_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_eisa.c,v 1.22 2020/07/05 20:17:25 krw Exp $ */ +/* $OpenBSD: ahc_eisa.c,v 1.23 2020/07/05 21:54:44 krw Exp $ */ /* $NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $ */ /* @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.22 2020/07/05 20:17:25 krw Exp $ + * $Id: ahc_eisa.c,v 1.23 2020/07/05 21:54:44 krw Exp $ */ #include <sys/param.h> @@ -186,7 +186,7 @@ void *aux; * SCSI_IS_SCSIBUS_B() must returns false until sc_channel_b * has been properly initialized. */ - ahc->sc_channel_b.bus = NULL; + ahc->sc_child_b = NULL; ahc->channel = 'A'; ahc->chip = AHC_AIC7770|AHC_EISA; diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c index 4cb920f0d0e..677c96b3314 100644 --- a/sys/dev/ic/aic7xxx_openbsd.c +++ b/sys/dev/ic/aic7xxx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.c,v 1.61 2020/06/27 14:29:44 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.c,v 1.62 2020/07/05 21:54:44 krw Exp $ */ /* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -109,22 +109,22 @@ ahc_attach(struct ahc_softc *ahc) if ((ahc->flags & AHC_PRIMARY_CHANNEL) == 0) { saa.saa_sc_link = &ahc->sc_channel; - ahc->sc_child = config_found((void *)&ahc->sc_dev, - &saa, scsiprint); + ahc->sc_child = (struct scsibus_softc *)config_found( + (void *)&ahc->sc_dev, &saa, scsiprint); if (ahc->features & AHC_TWIN) { saa.saa_sc_link = &ahc->sc_channel_b; - ahc->sc_child_b = config_found((void *)&ahc->sc_dev, - &saa, scsiprint); + ahc->sc_child_b = (struct scsibus_softc *)config_found( + (void *)&ahc->sc_dev, &saa, scsiprint); } } else { if (ahc->features & AHC_TWIN) { saa.saa_sc_link = &ahc->sc_channel_b; - ahc->sc_child = config_found((void *)&ahc->sc_dev, - &saa, scsiprint); + ahc->sc_child = (struct scsibus_softc *)config_found( + (void *)&ahc->sc_dev, &saa, scsiprint); } saa.saa_sc_link = &ahc->sc_channel; - ahc->sc_child_b = config_found((void *)&ahc->sc_dev, - &saa, scsiprint); + ahc->sc_child_b = (struct scsibus_softc *)config_found( + (void *)&ahc->sc_dev, &saa, scsiprint); } splx(s); diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h index 963daca5841..48036ebff8f 100644 --- a/sys/dev/ic/aic7xxx_openbsd.h +++ b/sys/dev/ic/aic7xxx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.h,v 1.28 2020/07/05 20:17:25 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.h,v 1.29 2020/07/05 21:54:44 krw Exp $ */ /* $NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -87,7 +87,7 @@ /****************************** Platform Macros *******************************/ #define SCSI_IS_SCSIBUS_B(ahc, sc_link) \ - (((sc_link)->bus != NULL) && ((sc_link)->bus == (ahc)->sc_channel_b.bus)) + (((sc_link)->bus != NULL) && ((sc_link)->bus == (ahc)->sc_child_b)) #define SCSI_SCSI_ID(ahc, sc_link) \ (SCSI_IS_SCSIBUS_B(ahc, sc_link) ? ahc->our_id_b : ahc->our_id) #define SCSI_CHANNEL(ahc, sc_link) \ diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index fdc93b365b8..3b6b48ed9e5 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxxvar.h,v 1.33 2020/02/06 18:18:51 krw Exp $ */ +/* $OpenBSD: aic7xxxvar.h,v 1.34 2020/07/05 21:54:44 krw Exp $ */ /* * Core definitions and data structures shareable across OS platforms. * @@ -38,7 +38,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxxvar.h,v 1.33 2020/02/06 18:18:51 krw Exp $ + * $Id: aic7xxxvar.h,v 1.34 2020/07/05 21:54:44 krw Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ */ @@ -937,8 +937,8 @@ struct ahc_softc { struct scsi_link sc_channel; struct scsi_link sc_channel_b; - struct device * sc_child; - struct device * sc_child_b; + struct scsibus_softc *sc_child; + struct scsibus_softc *sc_child_b; bus_space_tag_t tag; bus_space_handle_t bsh; diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c index 215a3804724..9ac9276d31a 100644 --- a/sys/dev/ic/qlw.c +++ b/sys/dev/ic/qlw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw.c,v 1.38 2020/07/05 20:17:25 krw Exp $ */ +/* $OpenBSD: qlw.c,v 1.39 2020/07/05 21:54:44 krw Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -129,7 +129,7 @@ void qlw_dump_iocb_segs(struct qlw_softc *, void *, int); static inline int qlw_xs_bus(struct qlw_softc *sc, struct scsi_xfer *xs) { - return ((xs->sc_link->bus == sc->sc_link[0].bus) ? 0 : 1); + return ((xs->sc_link->bus == sc->sc_scsibus[0]) ? 0 : 1); } static inline u_int16_t diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 7908a181924..3dde810408f 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.58 2020/07/05 20:17:25 krw Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.59 2020/07/05 21:54:44 krw Exp $ */ /* $NetBSD: ahc_pci.c,v 1.43 2003/08/18 09:16:22 taca Exp $ */ /* @@ -42,7 +42,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.58 2020/07/05 20:17:25 krw Exp $ + * $Id: ahc_pci.c,v 1.59 2020/07/05 21:54:44 krw Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -739,7 +739,7 @@ ahc_pci_attach(parent, self, aux) * SCSI_IS_SCSIBUS_B() must returns false until sc_channel_b * has been properly initialized. */ - ahc->sc_channel_b.bus = NULL; + ahc->sc_child_b = NULL; ahc->dev_softc = pa; |