Remove __HAVE_GENERIC_SOFT_INTERRUPTS #ifdef.

This commit is contained in:
soren 2002-01-14 19:08:35 +00:00
parent 07e21646eb
commit 70e85fb54b
2 changed files with 2 additions and 27 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.8 2001/09/15 00:46:13 wdk Exp $ */
/* $NetBSD: intr.h,v 1.9 2002/01/14 19:08:35 soren Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@ -87,8 +87,6 @@ extern void _clrsoftintr __P((int));
splx(s); \
} while (0)
#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
#define softintr_schedule(arg) \
do { \
struct mipsco_intrhand *__ih = (arg); \
@ -100,16 +98,6 @@ extern struct mipsco_intrhand *softnet_intrhand;
#define setsoftnet() softintr_schedule(softnet_intrhand)
#else /* ! __HAVE_GENERIC_SOFT_INTERRUPTS */
#define SIR_NET 0x01
#define SIR_SERIAL 0x02
# define setsoftclock() _setsoftintr(MIPS_SOFT_INT_MASK_0)
# define setsoftnet() setsoft(SIR_NET)
# define setsoftserial() setsoft(SIR_SERIAL)
#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */
/*
* nesting interrupt masks.
*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.10 2001/11/19 17:36:41 soren Exp $ */
/* $NetBSD: intr.h,v 1.11 2002/01/14 19:08:35 soren Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -86,8 +86,6 @@
splx(s); \
} while (0)
#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
#define softintr_schedule(arg) \
do { \
struct sgimips_intrhand *__ih = (arg); \
@ -99,16 +97,6 @@ extern struct sgimips_intrhand *softnet_intrhand;
#define setsoftnet() softintr_schedule(softnet_intrhand)
#else /* ! __HAVE_GENERIC_SOFT_INTERRUPTS */
#define SIR_NET 0x01
#define SIR_SERIAL 0x02
#define setsoftclock() _setsoftintr(MIPS_SOFT_INT_MASK_0)
#define setsoftnet() setsoft(SIR_NET)
#define setsoftserial() setsoft(SIR_SERIAL)
#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */
#define NINTR 32
struct sgimips_intrhand {
@ -169,7 +157,6 @@ void softintr_disestablish(void *);
void softintr_init(void);
void softintr_dispatch(void);
#endif /* _LOCORE */
#endif /* !_KERNEL */