 @@ -1,14 +1,14 @@
-/*	$NetBSD: adb_direct.c,v 1.71 2024/02/28 13:05:39 thorpej Exp $	*/
+/*	$NetBSD: adb_direct.c,v 1.72 2024/03/05 20:58:05 andvar Exp $	*/
 /* From: adb_direct.c 2.02 4/18/97 jpw */
 /*
  * Copyright (C) 1996, 1997 John P. Wittkoski
  * 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
 @@ -52,27 +52,27 @@
  *    over to using adbCommand structs directly.
  *  - There is a bug in the state machine of adb_intr_cuda
  *    code that causes hangs, especially on 030 machines, probably
  *    because of some timing issues. Because I have been unable to
  *    determine the exact cause of this bug, I used the timeout function
  *    to check for and recover from this condition. If anyone finds
  *    the actual cause of this bug, the calls to timeout and the
  *    adb_cuda_tickle routine can be removed.
  */
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.71 2024/02/28 13:05:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.72 2024/03/05 20:58:05 andvar Exp $");
 #include "opt_adb.h"
 #include <sys/param.h>
 #include <sys/pool.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <machine/viareg.h>
 #include <machine/adbsys.h>			/* required for adbvar.h */
 @@ -384,27 +384,27 @@ adb_cuda_tickle(void)
 			tickle_serial = adb_cuda_serial;
 			tickle_count = 0;
+		}
 	} else {
 		tickle_serial = adb_cuda_serial;
 		tickle_count = 0;
+	}
 	callout_reset(&adb_cuda_tickle_ch, ADB_TICKLE_TICKS,
 	    (void *)adb_cuda_tickle, NULL);
+}
 /*
- * called when when an adb interrupt happens
+ * called when an adb interrupt happens
+ *
  * Cuda version of adb_intr
  * TO DO: do we want to add some calls to intr_dispatch() here to
  * grab serial interrupts?
  */
 void
 adb_intr_cuda(void *arg)
+{
 	volatile int i __unused, ending;
 	volatile unsigned int s;
 	struct adbCommand packet;
 	s = splhigh();		/* can't be too careful - might be called */
 @@ -1198,27 +1198,27 @@ adb_guess_next_device(void)
 				break;
+			}
 			/* found the next device */
 			if (ADBDevTable[dummy].devType != 0)
 				break;
+		}
 		adbLastDevice = ADBDevTable[dummy].currentAddr;
+	}
 	return adbLastDevice;
+}
 /*
- * Called when when an adb interrupt happens.
+ * Called when an adb interrupt happens.
  * This routine simply transfers control over to the appropriate
  * code for the machine we are running on.
  */
 void
 adb_intr(void *arg)
+{
 	switch (adbHardware) {
 	case ADB_HW_II:
 		adb_intr_II(arg);
 		break;
 	case ADB_HW_IISI:
 		adb_intr_IIsi(arg);
 @@ -1231,27 +1231,27 @@ adb_intr(void *arg)
 		adb_intr_cuda(arg);
 		break;
 	case ADB_HW_IOP:	/* Should not come through here. */
 		break;
 	case ADB_HW_UNKNOWN:
 		break;
+	}
+}
 /*
- * called when when an adb interrupt happens
+ * called when an adb interrupt happens
+ *
  * IIsi version of adb_intr
+ *
  */
 void
 adb_intr_IIsi(void *arg)
+{
 	struct adbCommand packet;
 	int ending;
 	unsigned int s;
 	s = splhigh();		/* can't be too careful - might be called */
 	/* from a routine, NOT an interrupt */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: adb_direct.c,v 1.45 2023/09/21 09:31:49 msaitoh Exp $	*/
+/*	$NetBSD: adb_direct.c,v 1.46 2024/03/05 20:58:05 andvar Exp $	*/
 /* From: adb_direct.c 2.02 4/18/97 jpw */
 /*
  * Copyright (C) 1996, 1997 John P. Wittkoski
  * 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
 @@ -50,27 +50,27 @@
  *  - (Related to above) Actually implement the adbOutbound queue.
  *    This is fairly easy once you switch all the intr routines
  *    over to using adbCommand structs directly.
  *  - There is a bug in the state machine of adb_intr_cuda
  *    code that causes hangs, especially on 030 machines, probably
  *    because of some timing issues. Because I have been unable to
  *    determine the exact cause of this bug, I used the timeout function
  *    to check for and recover from this condition. If anyone finds
  *    the actual cause of this bug, the calls to timeout and the
  *    adb_cuda_tickle routine can be removed.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.45 2023/09/21 09:31:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.46 2024/03/05 20:58:05 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
 #include <machine/adbsys.h>
 #include <machine/pio.h>
 #include <macppc/dev/viareg.h>
 #include <macppc/dev/adbvar.h>
 @@ -309,27 +309,27 @@ adb_cuda_tickle(void)
 			tickle_serial = adb_cuda_serial;
 			tickle_count = 0;
+		}
 	} else {
 		tickle_serial = adb_cuda_serial;
 		tickle_count = 0;
+	}
 	callout_reset(&adb_cuda_tickle_ch, ADB_TICKLE_TICKS,
 	    (void *)adb_cuda_tickle, NULL);
+}
 /*
- * called when when an adb interrupt happens
+ * called when an adb interrupt happens
+ *
  * Cuda version of adb_intr
  * TO DO: do we want to add some calls to intr_dispatch() here to
  * grab serial interrupts?
  */
 int
 adb_intr_cuda(void *arg)
+{
 	volatile int i, ending;
 	volatile unsigned int s;
 	struct adbCommand packet;
 	uint8_t reg;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.c,v 1.166 2023/11/29 11:40:37 mlelstv Exp $	*/
+/*	$NetBSD: intr.c,v 1.167 2024/03/05 20:58:05 andvar Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by Jason R. Thorpe.
+ *
  * 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.
 @@ -123,27 +123,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT 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.
+ *
  *	@(#)isa.c	7.2 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.166 2023/11/29 11:40:37 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.167 2024/03/05 20:58:05 andvar Exp $");
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 @@ -1046,27 +1046,27 @@ intr_mask_xcall(void *arg1, void *arg2)
 		if (--source->is_mask_count == 0) {
 			/*
 			 * If this interrupt source is being moved, don't
 			 * unmask it at the hw.
 			 */
 			if (! source->is_distribute_pending) {
 				(*pic->pic_hwunmask)(pic, ih->ih_pin);
+			}
 			/*
 			 * For level-sensitive interrupts, the hardware
 			 * will let us know.  For everything else, we
 			 * need to explicitly handle interrupts that
-			 * happened when when the source was masked.
+			 * happened when the source was masked.
 			 */
 			const uint64_t bit = (1U << ih->ih_slot);
 			if (ci->ci_imasked & bit) {
 				ci->ci_imasked &= ~bit;
 				if (source->is_type != IST_LEVEL) {
 					ci->ci_ipending |= bit;
 					force_pending = true;
+				}
+			}
+		}
+	}
 	/* Re-enable interrupts. */