X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..eee3565979933af707c711411001ba11fe406a3c:/pexpert/i386/pe_interrupt.c?ds=sidebyside

diff --git a/pexpert/i386/pe_interrupt.c b/pexpert/i386/pe_interrupt.c
index 2040b0e46..19b0e003f 100644
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,12 +23,18 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
-#include <sys/kdebug.h>
+
+#if CONFIG_DTRACE && DEVELOPMENT
+#include <mach/sdt.h>
+#endif
+
+void PE_incoming_interrupt(int);
+
 
 struct i386_interrupt_handler {
 	IOInterruptHandler	handler;
@@ -38,30 +47,32 @@ typedef struct i386_interrupt_handler i386_interrupt_handler_t;
 
 i386_interrupt_handler_t	PE_interrupt_handler;
 
-void PE_platform_interrupt_initialize(void)
-{
-}
+
 
 void
-PE_incoming_interrupt(int interrupt, void *eip)
+PE_incoming_interrupt(int interrupt)
 {
-	boolean_t		save_int;
 	i386_interrupt_handler_t	*vector;
 
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,
-	   0, (unsigned int)eip, 0, 0, 0);
-
 	vector = &PE_interrupt_handler;
-	save_int  = ml_set_interrupts_enabled(FALSE);
-	vector->handler(vector->target, vector->refCon, vector->nub, interrupt);
-	ml_set_interrupts_enabled(save_int);
 
-	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_start, void *, vector->nub, int, 0, 
+                    void *, vector->target, IOInterruptHandler, vector->handler,
+                    void *, vector->refCon);
+#endif
+
+	vector->handler(vector->target, NULL, vector->nub, interrupt);
 
+#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, int source,
+void PE_install_interrupt_handler(void *nub,
+				  __unused int source,
 				  void *target,
 				  IOInterruptHandler handler,
 				  void *refCon)