X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..db6096698656d32db7df630594bd9617ee54f828:/pexpert/i386/pe_interrupt.c

diff --git a/pexpert/i386/pe_interrupt.c b/pexpert/i386/pe_interrupt.c
index 559a0d813..19b0e003f 100644
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -28,11 +28,12 @@
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
-#include <i386/mp.h>
-#include <sys/kdebug.h>
 
+#if CONFIG_DTRACE && DEVELOPMENT
+#include <mach/sdt.h>
+#endif
 
-void PE_incoming_interrupt(int, void *);
+void PE_incoming_interrupt(int);
 
 
 struct i386_interrupt_handler {
@@ -49,21 +50,25 @@ i386_interrupt_handler_t	PE_interrupt_handler;
 
 
 void
-PE_incoming_interrupt(int interrupt, void *state)
+PE_incoming_interrupt(int interrupt)
 {
 	i386_interrupt_handler_t	*vector;
 
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,
-			      0, ((unsigned int *)state)[7], 0, 0, 0);
-
 	vector = &PE_interrupt_handler;
 
-	if (!lapic_interrupt(interrupt, state)) {
-		vector->handler(vector->target, state, vector->nub, interrupt);
-	}
+#if CONFIG_DTRACE && DEVELOPMENT
+        DTRACE_INT5(interrupt_start, void *, vector->nub, int, 0, 
+                    void *, vector->target, IOInterruptHandler, vector->handler,
+                    void *, vector->refCon);
+#endif
+
+	vector->handler(vector->target, NULL, vector->nub, interrupt);
 
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
-	   0, 0, 0, 0, 0);
+#if CONFIG_DTRACE && DEVELOPMENT
+        DTRACE_INT5(interrupt_complete, void *, vector->nub, int, 0, 
+                    void *, vector->target, IOInterruptHandler, vector->handler,
+                    void *, vector->refCon);
+#endif
 }
 
 void PE_install_interrupt_handler(void *nub,