xnu-792.24.17.tar.gz

[apple/xnu.git] / pexpert / i386 / pe_interrupt.c

diff --git a/pexpert/i386/pe_interrupt.c b/pexpert/i386/pe_interrupt.c
index 2040b0e4690f93bb2fae0aa9612ca269a5ffc125..322de1037abd1d160a0d32f48ec1b7b873626f99 100644 (file)
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -3,30 +3,32 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
+#include <i386/mp.h>
 #include <sys/kdebug.h>
 
+
+void PE_incoming_interrupt(int, void *);
+
+
 struct i386_interrupt_handler {
        IOInterruptHandler      handler;
        void                    *nub;
@@ -38,30 +40,28 @@ 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, void *state)
 {
-       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);
+                             0, ((unsigned int *)state)[7], 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);
+
+       if (!lapic_interrupt(interrupt, state)) {
+               vector->handler(vector->target, state, vector->nub, interrupt);
+       }
 
        KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
           0, 0, 0, 0, 0);
-
 }
 
-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)