===================================================================
RCS file: /cvs/prex-old/sys/include/irq.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/sys/include/irq.h	2008/06/03 10:38:45	1.1.1.1
+++ prex-old/sys/include/irq.h	2008/08/13 17:12:30	1.1.1.1.2.1
@@ -36,10 +36,9 @@
 	int		vector;		/* vector number */
 	int		(*isr)(int);	/* pointer to isr */
 	void		(*ist)(int);	/* pointer to ist */
-	u_int		count;		/* interrupt count */
-	int		ist_request;	/* number of ist request */
+	int		istreq;		/* number of ist request */
 	thread_t	thread;		/* thread id of ist */
-	struct event	ist_event;	/* event for ist */
+	struct event	istevt;		/* event for ist */
 };
 
 /*
@@ -72,12 +71,11 @@
  */
 #define ISTPRIO(prio)	(PRIO_IST + (IPL_HIGH - prio))
 
-extern int	 irq_attach(int, int, int, int (*)(int), void (*)(int));
-extern void	 irq_detach(int);
+extern irq_t	 irq_attach(int, int, int, int (*)(int), void (*)(int));
+extern void	 irq_detach(irq_t);
 extern void	 irq_lock(void);
 extern void	 irq_unlock(void);
 extern void	 irq_handler(int);
-extern void	 irq_dump(void);
 extern void	 irq_init(void);
 
 #endif /* !_IRQ_H */