From c9bfe684089d0ccc3ba7f108132e367148ee1e06 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 31 May 1997 09:07:36 +0000
Subject: [PATCH] move intrhand2_t from isa_device.h to machine/types.h - it's
 used far more than in the isa dependent code. create intrmask_t in
 machine/types.h  (replaces "intrmask" typedef from sys/interrupt.h)

Reviewed by: bde
---
 sys/i386/include/types.h  | 8 +++++++-
 sys/i386/isa/isa_device.h | 9 +--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index 313084ed9f1..017c7a2b02f 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
- * $Id$
+ * $Id: types.h,v 1.10 1997/02/22 09:35:21 peter Exp $
  */
 
 #ifndef _MACHINE_TYPES_H_
@@ -69,4 +69,10 @@ typedef	int32_t			register_t;
 
 typedef int32_t			ufs_daddr_t;
 
+/* Interrupt mask (spl, xxx_imask, etc) */
+typedef u_int32_t		intrmask_t;
+
+/* Interrupt handler function type - arg should be "void *" one day */
+typedef void			inthand2_t(int _unit);
+
 #endif /* !_MACHINE_TYPES_H_ */
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 832bf81aaac..dad1f4d4f55 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.39 1997/04/27 21:18:58 fsmp Exp $
+ *	$Id: isa_device.h,v 1.40 1997/05/26 14:42:24 se Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -48,13 +48,6 @@
  */
 typedef void inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss));
 
-/*
- * Usual type of the second (C) part of an interrupt handler.  Some bogus
- * ones need the arg to be the interrupt frame (and not a copy of it, which
- * is all that is possible in C).
- */
-typedef void inthand2_t __P((int unit));
-
 /*
  * Per device structure.
  *
-- 
2.45.2