 @@ -1,14 +1,14 @@
-/* 	$NetBSD: intr.h,v 1.20 2020/07/23 19:04:03 skrll Exp $	*/
+/* 	$NetBSD: intr.h,v 1.21 2020/07/27 12:32:54 skrll Exp $	*/
 /*
  * Copyright (c) 1997 Mark Brinicombe.
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -62,26 +62,34 @@
 #define	IST_EDGE_BOTH	6
 #ifdef __OLD_INTERRUPT_CODE	/* XXX XXX XXX */
 #include <machine/irqhandler.h>
 #include <arm/arm32/psl.h>
 #else	/* !__OLD_INTERRUPT_CODE */
 #ifndef _LOCORE
 #include <sys/queue.h>
 #if defined(_MODULE)
 int	_splraise(int);
 int	_spllower(int);
 void	splx(int);
 #else	/* _MODULE */
 #include "opt_arm_intr_impl.h"
 #if defined(ARM_INTR_IMPL)
 /*
  * Each board needs to define the following functions:
+ *
  * int	_splraise(int);
  * int	_spllower(int);
  * void	splx(int);
  * void	_setsoftintr(int);
+ *
  * These may be defined as functions, static inline functions, or macros,
 @@ -108,26 +116,28 @@
  *	}
  */
 #include ARM_INTR_IMPL
 #else	/* ARM_INTR_IMPL */
 #error ARM_INTR_IMPL not defined.
 #endif	/* ARM_INTR_IMPL */
 #define splsoft()	_splraise(IPL_SOFT)
 #endif /* _MODULE */
 typedef uint8_t ipl_t;
 typedef struct {
 	ipl_t _ipl;
 } ipl_cookie_t;
 static inline ipl_cookie_t
 makeiplcookie(ipl_t ipl)
+{
 	return (ipl_cookie_t){._ipl = ipl};
+}
 static inline int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.h,v 1.11 2020/07/23 19:23:49 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.12 2020/07/27 12:32:54 skrll Exp $	*/
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -56,26 +56,34 @@
 #define	IST_NONE	0	/* none */
 #define	IST_PULSE	1	/* pulsed */
 #define	IST_EDGE	2	/* edge-triggered */
 #define	IST_LEVEL	3	/* level-triggered */
 #define IST_LEVEL_LOW	 IST_LEVEL
 #define IST_LEVEL_HIGH   4
 #define IST_EDGE_FALLING IST_EDGE
 #define IST_EDGE_RISING  5
 #define IST_EDGE_BOTH    6
 #ifndef _LOCORE
 #if defined(_MODULE)
 int	_splraise(int);
 int	_spllower(int);
 void	splx(int);
 #else	/* _MODULE */
 #include "opt_arm_intr_impl.h"
 #if defined(ARM_INTR_IMPL)
 /*
  * Each board needs to define the following functions:
+ *
  * int	_splraise(int);
  * int	_spllower(int);
  * void	splx(int);
  * void	_setsoftintr(int);
+ *
  * These may be defined as functions, static inline functions, or macros,
 @@ -100,26 +108,28 @@
  *	{
  *		return boardtype_splx(spl);
  *	}
  */
 #include ARM_INTR_IMPL
 #else /* ARM_INTR_IMPL */
 #error ARM_INTR_IMPL not defined.
 #endif	/* ARM_INTR_IMPL */
 #endif /* _MODULE */
 typedef uint8_t ipl_t;
 typedef struct {
 	ipl_t _ipl;
 } ipl_cookie_t;
 static inline ipl_cookie_t
 makeiplcookie(ipl_t ipl)
+{
 	return (ipl_cookie_t){._ipl = ipl};
+}
 static inline int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.h,v 1.10 2020/07/23 19:24:38 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.11 2020/07/27 12:32:54 skrll Exp $	*/
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -58,26 +58,34 @@
 #define	IST_EDGE	2	/* edge-triggered */
 #define	IST_LEVEL	3	/* level-triggered */
 #define IST_LEVEL_LOW	 IST_LEVEL
 #define IST_LEVEL_HIGH   4
 #define IST_EDGE_FALLING IST_EDGE
 #define IST_EDGE_RISING  5
 #define IST_EDGE_BOTH    6
 #ifndef _LOCORE
 #include <sys/queue.h>
 #if defined(_MODULE)
 int	_splraise(int);
 int	_spllower(int);
 void	splx(int);
 #else	/* _MODULE */
 #include "opt_arm_intr_impl.h"
 #if defined(ARM_INTR_IMPL)
 /*
  * Each board needs to define the following functions:
+ *
  * int	_splraise(int);
  * int	_spllower(int);
  * void	splx(int);
+ *
  * These may be defined as functions, static inline functions, or macros,
  * but there must be a _spllower() and splx() defined as functions callable
 @@ -103,26 +111,28 @@
  *	}
  */
 #include ARM_INTR_IMPL
 #else /* ARM_INTR_IMPL */
 #error ARM_INTR_IMPL not defined.
 #endif	/* ARM_INTR_IMPL */
 #define	splsoft()	_splraise(IPL_SOFT)
 #endif /* _MODULE */
 typedef uint8_t ipl_t;
 typedef struct {
 	ipl_t _ipl;
 } ipl_cookie_t;
 static inline ipl_cookie_t
 makeiplcookie(ipl_t ipl)
+{
 	return (ipl_cookie_t){._ipl = ipl};
+}
 static inline int