From 2bd86002940242337411d0d4913c56ac516fc671 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 1 Jun 1997 16:05:14 +0000 Subject: [PATCH] Move "typedef struct intrec {} intrec" from sys/interrupt.h to kern_intr.c since that's the only place that it's used. Submitted by: se (apparently on suggestion from dfr) --- sys/kern/kern_intr.c | 15 ++++++++++++++- sys/sys/interrupt.h | 27 +++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 56880d9f78c..3f7feaf4c52 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -23,7 +23,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: kern_intr.c,v 1.2 1997/05/28 22:11:00 se Exp $ + * $Id: kern_intr.c,v 1.3 1997/05/31 09:30:39 peter Exp $ * */ @@ -46,6 +46,19 @@ #include "vector.h" +typedef struct intrec { + intrmask_t mask; + inthand2_t *handler; + void *argument; + struct intrec *next; + void *devdata; + int intr; + intrmask_t *maskptr; + int flags; +#define INTR_FAST 0x00000001 /* fast interrupt handler */ +#define INTR_EXCL 0x00010000 /* excl. intr, default is shared */ +} intrec; + /* * The interrupt multiplexer calls each of the handlers in turn, * and applies the associated interrupt mask to "cpl", which is diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index 7e7fcb14971..10082f89138 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -23,30 +23,17 @@ * (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: interrupt.h,v 1.1 1997/05/26 14:37:31 se Exp $ - * + * $Id: interrupt.h,v 1.2 1997/05/31 09:33:29 peter Exp $ */ -typedef struct intrec { - intrmask_t mask; - inthand2_t *handler; - void *argument; - struct intrec *next; - void *devdata; - int intr; - intrmask_t *maskptr; - int flags; -#define INTR_FAST 0x00000001 /* fast interrupt handler */ -#define INTR_EXCL 0x00010000 /* excl. intr, default is shared */ -} intrec; - /* XXX currently dev_instance must be set to the ISA device_id or -1 for PCI */ -intrec *intr_create(void *dev_instance, int irq, inthand2_t handler, - void *arg, intrmask_t *maskptr, int flags); -int intr_destroy(intrec *idesc); +struct intrec *intr_create(void *dev_instance, int irq, inthand2_t handler, + void *arg, intrmask_t *maskptr, int flags); + +int intr_destroy(struct intrec *idesc); -int intr_connect(intrec *idesc); -int intr_disconnect(intrec *idesc); +int intr_connect(struct intrec *idesc); +int intr_disconnect(struct intrec *idesc); /* XXX emulate old interface for now ... */ int register_intr __P((int intr, int device_id, u_int flags, -- 2.45.2