Added `#include "ioconf.h"' to <machine/conf.h> and cleaned up the

misplaced extern declarations (mostly prototypes of interrupt handlers)
that this exposed.  The prototypes should be moved back to the driver
sources when the functions are staticalized.

Added idempotency guards to <machine/conf.h>.  "ioconf.h" can't be
included when building LKMs so define a wart in bsd.kmod.mk to help
guard against including it.

11 files changed, 13 insertions, 25 deletions

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 786ae30f13d4..0b90ac0525a9 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
+ *	$Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
  */
 
 #include "cy.h"
@@ -325,8 +325,7 @@ struct com_s {
  */
 
 /* Interrupt handling entry points. */
-void	siointr		__P((int unit));
-void	siointrts	__P((int unit));
+inthand2_t	siointrts;
 void	siopoll		__P((void));
 
 /* Device switch entry points. */
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 786ae30f13d4..0b90ac0525a9 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
+ *	$Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
  */
 
 #include "cy.h"
@@ -325,8 +325,7 @@ struct com_s {
  */
 
 /* Interrupt handling entry points. */
-void	siointr		__P((int unit));
-void	siointrts	__P((int unit));
+inthand2_t	siointrts;
 void	siopoll		__P((void));
 
 /* Device switch entry points. */
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index f873611299ea..7af27f4c0ea5 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -13,7 +13,7 @@
  *   the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
  *   and a variety of similar clones.
  *
- * $Id: if_ed.c,v 1.82 1995/10/28 22:46:26 pst Exp $
+ * $Id: if_ed.c,v 1.83 1995/10/31 18:41:08 phk Exp $
  */
 
 #include "ed.h"
@@ -109,7 +109,6 @@ struct ed_softc {
 
 static int     ed_attach(struct isa_device *);
 static void    ed_init(int);
-void    edintr(int);
 static int     ed_ioctl(struct ifnet *, int, caddr_t);
 static int     ed_probe(struct isa_device *);
 static void    ed_start(struct ifnet *);
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 690f3eb34d76..5cea1290df3d 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.32 1995/10/26 20:29:37 julian Exp $
+ *  $Id: if_ep.c,v 1.33 1995/10/28 15:39:04 phk Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -113,7 +113,6 @@ static void epmbuffill __P((caddr_t, int));
 static void epmbufempty __P((struct ep_softc *));
 
 void epinit __P((int));
-void epintr __P((int));
 void epread __P((struct ep_softc *));
 void epreset __P((int));
 void epstart __P((struct ifnet *));
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 150e6924fee0..5a2c861ed699 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.67 1995/10/28 15:38:57 phk Exp $
+ *	$Id: fd.c,v 1.68 1995/11/04 13:23:34 bde Exp $
  *
  */
 
@@ -274,7 +274,6 @@ static int fdattach(struct isa_device *);
 
 /* exported functions */
 int fdsize (dev_t);
-void fdintr(fdcu_t);
 
 /* needed for ft driver, thus exported */
 int in_fdc(fdcu_t);
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index b17d4fbc9973..01ec89a659f3 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -245,9 +245,6 @@ struct fe_softc {
  */
 #define IFNET2SOFTC(P)	( ( struct fe_softc * )(P) )
 
-/* Public entry point.  This is the only functoin which must be external.  */
-void		feintr		( int );
-
 /* Standard driver entry points.  These can be static.  */
 int		fe_probe	( struct isa_device * );
 int		fe_attach	( struct isa_device * );
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index f4a81f7ce5b7..b1484d151aef 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.13 1995/07/16 10:12:06 bde Exp $
+ * $Id: mse.c,v 1.14 1995/09/08 11:07:50 bde Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -63,7 +63,6 @@
 
 static int mseprobe(struct isa_device *);
 static int mseattach(struct isa_device *);
-void mseintr(int);
 
 struct	isa_driver msedriver = {
 	mseprobe, mseattach, "mse"
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 03507e457bab..0feabf01a50c 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -67,8 +67,8 @@ int     rcattach        __P((struct isa_device *));
  * regression tests :-(.
  *
  *
+ *
  */
-void    rcintr          __P((int));
 void    rcpoll          __P((void));
 
 #define rcin(port)      RC_IN  (nec, port)
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 06bd4555cef0..05de593157b0 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.11 1995/10/28 15:39:19 phk Exp $
+ *	$Id: si.c,v 1.12 1995/11/04 13:23:40 bde Exp $
  */
 
 #ifndef lint
@@ -94,7 +94,6 @@ static void si_disc_optim __P((struct tty *tp, struct termios *t,
 static void sihardclose __P((struct si_port *pp));
 static void sidtrwakeup __P((void *chan));
 
-void	siintr	__P((int unit));
 int	siparam __P((struct tty *, struct termios *));
 
 extern	void	si_registerdev __P((struct isa_device *id));
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 18d7a452fe2d..2337ea306f0f 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.115 1995/10/22 15:38:05 bde Exp $
+ *	$Id: sio.c,v 1.116 1995/11/04 13:23:43 bde Exp $
  */
 
 #include "sio.h"
@@ -251,8 +251,7 @@ struct com_s {
  */
 
 /* Interrupt handling entry points. */
-void	siointr		__P((int unit));
-void	siointrts	__P((int unit));
+inthand2_t	siointrts;
 void	siopoll		__P((void));
 
 /* Device switch entry points. */
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index e660ba7dfc37..98599543a597 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.10 1995/07/11 18:34:30 bde Exp $
+ *	$Id: syscons.h,v 1.11 1995/09/10 21:35:13 bde Exp $
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
@@ -170,7 +170,6 @@ int scprobe(struct isa_device *dev);
 int scattach(struct isa_device *dev);
 int scparam(struct tty *tp, struct termios *t);
 void scstart(struct tty *tp);
-void scintr(int unit);
 static void scinit(void);
 static u_int scgetc(int noblock);
 static scr_stat *get_scr_stat(dev_t dev);