1 files changed, 2 insertions, 57 deletions

diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index 27dbcc663df..2f68e5bb6aa 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.31 2009/03/26 17:24:33 oga Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.32 2009/04/10 20:53:54 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
 
 /*
@@ -66,9 +66,9 @@
  * Exported definitions unique to SPARC cpu support.
  */
 
-#include <sys/evcount.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
+#include <machine/intr.h>
 #include <sparc/sparc/intreg.h>
 #include <sparc/sparc/cpuvar.h>
 
@@ -94,32 +94,6 @@ extern int eintstack[];
 #define	CLKF_INTR(framep)	((framep)->fp < (u_int)eintstack)
 
 /*
- * Software interrupt request `register'.
- */
-union sir {
-	int	sir_any;
-	char	sir_which[4];
-};
-extern union sir sir;
-
-#define SIR_NET		0
-#define SIR_CLOCK	1
-
-#if defined(SUN4M)
-extern void	raise(int, int);
-#if !(defined(SUN4) || defined(SUN4C))
-#define setsoftint()	raise(0,1)
-#else /* both defined */
-#define setsoftint()	(cputyp == CPU_SUN4M ? raise(0,1) : ienab_bis(IE_L1))
-#endif /* !4,!4c */
-#else	/* 4m not defined */
-#define setsoftint()	ienab_bis(IE_L1)
-#endif /* SUN4M */
-
-#define setsoftnet()	(sir.sir_which[SIR_NET] = 1, setsoftint())
-#define setsoftclock()	(sir.sir_which[SIR_CLOCK] = 1, setsoftint())
-
-/*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
  */
@@ -148,34 +122,6 @@ extern int	want_ast;
 
 extern int	foundfpu;		/* true => we have an FPU */
 
-/*
- * Interrupt handler chains.  Interrupt handlers should return 0 for
- * ``not me'' or 1 (``I took care of it'').  intr_establish() inserts a
- * handler into the list.  The handler is called with its (single)
- * argument, or with a pointer to a clockframe if ih_arg is NULL.
- * ih_ipl specifies the interrupt level that should be blocked when
- * executing this handler.
- */
-struct intrhand {
-	int	(*ih_fun)(void *);
-	void	*ih_arg;
-	int	ih_ipl;
-	int	ih_vec;			/* human readable ipl for vmstat */
-	struct	evcount ih_count;
-	struct	intrhand *ih_next;
-};
-extern struct intrhand *intrhand[15];
-void	intr_establish(int level, struct intrhand *, int, const char *);
-void	vmeintr_establish(int vec, int level, struct intrhand *, int, const char *);
-
-/*
- * intr_fasttrap() is a lot like intr_establish, but is used for ``fast''
- * interrupt vectors (vectors that are not shared and are handled in the
- * trap window).  Such functions must be written in assembly.
- */
-int	intr_fasttrap(int, void (*)(void), int (*)(void *), void *);
-void	intr_fastuntrap(int);
-
 /* auxreg.c */
 void led_blink(void *);
 /* scf.c */
@@ -186,7 +132,6 @@ int isbad(struct dkbad *bt, int, int, int);
 /* machdep.c */
 int	ldcontrolb(caddr_t);
 void	dumpconf(void);
-void	intr_init(void);
 caddr_t	reserve_dumppages(caddr_t);
 /* clock.c */
 struct timeval;