 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic79xx.c,v 1.68 2022/05/23 19:52:35 andvar Exp $	*/
+/*	$NetBSD: aic79xx.c,v 1.69 2023/08/01 20:50:11 andvar Exp $	*/
 /*
  * Core routines and tables shareable across OS platforms.
+ *
  * Copyright (c) 1994-2002 Justin T. Gibbs.
  * Copyright (c) 2000-2003 Adaptec Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer,
 @@ -39,27 +39,27 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
+ *
  * Id: //depot/aic7xxx/aic7xxx/aic79xx.c#202 $
+ *
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.24 2003/06/28 04:46:54 gibbs Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc.
  * - April 2003
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.68 2022/05/23 19:52:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.69 2023/08/01 20:50:11 andvar Exp $");
 #include <dev/ic/aic79xx_osm.h>
 #include <dev/ic/aic79xx_inline.h>
 #include <dev/ic/aic7xxx_cam.h>
 #include <dev/microcode/aic7xxx/aicasm.h>
 #include <dev/microcode/aic7xxx/aicasm_insformat.h>
 /******************************** Globals *************************************/
 struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq);
 /***************************** Lookup Tables **********************************/
 @@ -6143,27 +6143,27 @@ ahd_init(struct ahd_softc *ahd)
 	if (i == 0) {
 		printf("%s: Timedout during current-sensing test\n",
 		       ahd_name(ahd));
 		goto init_done;
+	}
 	/* Latch Current Sensing status. */
 	error = ahd_read_flexport(ahd, FLXADDR_CURRENT_STAT, &current_sensing);
 	if (error != 0) {
 		printf("%s: current sensing timeout 3\n", ahd_name(ahd));
 		goto init_done;
+	}
-	/* Diable current sensing. */
+	/* Disable current sensing. */
 	ahd_write_flexport(ahd, FLXADDR_ROMSTAT_CURSENSECTL, 0);
 #ifdef AHD_DEBUG
 	if ((ahd_debug & AHD_SHOW_TERMCTL) != 0) {
 		printf("%s: current_sensing == 0x%x\n",
 		       ahd_name(ahd), current_sensing);
+	}
 #endif
 	warn_user = 0;
 	for (i = 0; i < 4; i++, current_sensing >>= FLX_CSTAT_SHIFT) {
 		u_int term_stat;
 		term_stat = (current_sensing & FLX_CSTAT_MASK);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ntwoc_pci.c,v 1.32 2022/05/24 06:28:01 andvar Exp $	*/
+/*	$NetBSD: if_ntwoc_pci.c,v 1.33 2023/08/01 20:50:11 andvar Exp $	*/
 /*
  * Copyright (c) 1998 Vixie Enterprises
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,27 +27,27 @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * This software has been written for Vixie Enterprises by Michael Graff
  * <explorer@flame.org>.  To learn more about Vixie Enterprises, see
  * ``http://www.vix.com''.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.32 2022/05/24 06:28:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.33 2023/08/01 20:50:11 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <sys/cpu.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -313,27 +313,27 @@ ntwoc_pci_attach(device_t parent, device
 	if (db1 != NTWOC_FE_ID_NONE)
 		numports++;
 	aprint_normal_dev(self, "%d port%s\n", numports,
 	       (numports > 1 ? "s" : ""));
 	aprint_normal_dev(self, "port 0 interface card: %s\n",
 	       ntwoc_pci_db_names[db0]);
 	if (numports > 1)
 		aprint_normal_dev(self, "port 1 interface card: %s\n",
 		       ntwoc_pci_db_names[db1]);
 	/*
 	 * enable the RS422 tristate transmit
-	 * diable clock output (use receiver clock for both)
+	 * disable clock output (use receiver clock for both)
 	 */
 	frontend_cr |= (NTWOC_FECR_TE0 | NTWOC_FECR_TE1);
 	frontend_cr &= ~(NTWOC_FECR_ETC0 | NTWOC_FECR_ETC1);
 	bus_space_write_2(sc->sc_sca.sc_iot, sc->sc_sca.sc_ioh,
 			  NTWOC_FECR, frontend_cr);
 	/*
 	 * initialize the SCA.  This will allocate DMAable memory based
 	 * on the number of ports we passed in, the size of each
 	 * buffer, and the number of buffers per port.
 	 */
 	sca->sc_parent = self;
 	sca->sc_read_1 = ntwoc_pci_sca_read_1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tdvfb.c,v 1.10 2021/08/07 16:19:14 thorpej Exp $	*/
+/*	$NetBSD: tdvfb.c,v 1.11 2023/08/01 20:50:11 andvar Exp $	*/
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Radoslaw Kujawa.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -39,27 +39,27 @@
  * This driver currently only support boards with ICS GENDAC (which seems to
  * be most popular, however at least two different DACs were used with CVG).
+ *
  * TODO (in no particular order):
  * - Finally fix 16-bit depth handling on big-endian machines.
  * - Expose card to userspace through /dev/3dfx compatible device file
  *   (for Glide).
  * - Allow mmap'ing of registers through wscons access op.
  * - Complete wscons emul ops acceleration support.
  * - Add support for others DACs (need hardware).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tdvfb.c,v 1.10 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tdvfb.c,v 1.11 2023/08/01 20:50:11 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/tdvfbreg.h>
 @@ -424,27 +424,27 @@ tdvfb_videomode_set(struct tdvfb_softc *
+	}
 	tdvfb_cvg_write(sc, TDV_OFF_FBIINIT1, fbiinit1);
 	if (sc->sc_voodootype == TDV_VOODOO_2) {
 		tdvfb_cvg_write(sc, TDV_OFF_FBIINIT6, fbiinit6);
 		tdvfb_cvg_write(sc, TDV_OFF_FBIINIT5, fbiinit5);
+	}
 	tdvfb_wait(sc);
 	/* unreset, enable DRAM refresh */
 	tdvfb_cvg_unset(sc, TDV_OFF_FBIINIT1, TDV_FBIINIT1_VIDEO_RST);
 	tdvfb_cvg_unset(sc, TDV_OFF_FBIINIT0, TDV_FBIINIT0_FBI_RST |
 	    TDV_FBIINIT0_FIFO_RST);
 	tdvfb_cvg_set(sc, TDV_OFF_FBIINIT2, TDV_FBIINIT2_DRAM_REFR);
-	/* diable access to FBIINIT regs */
+	/* disable access to FBIINIT regs */
 	pci_conf_write(sc->sc_pc, sc->sc_pcitag, TDV_INITENABLE_REG,
 	    TDV_INITENABLE_EN_FIFO);
 	tdvfb_wait(sc);
 	if (sc->sc_bpp == 16)
 		lfbmode = TDV_LFBMODE_565;
 	else if (sc->sc_bpp == 32)
 		lfbmode = TDV_LFBMODE_8888;
 	else
 		return false;
 #if BYTE_ORDER == BIG_ENDIAN
 	lfbmode |= TDV_LFBMODE_BSW_WR | TDV_LFBMODE_BSW_RD;