xnu-792.12.6.tar.gz

[apple/xnu.git] / iokit / Drivers / platform / drvAppleNMI / AppleNMI.cpp

diff --git a/iokit/Drivers/platform/drvAppleNMI/AppleNMI.cpp b/iokit/Drivers/platform/drvAppleNMI/AppleNMI.cpp
index bf9965c97c0c0b19fb9cce83054dc4931209e442..f5ef061a878143790c5e8765f002aa5be885d4d9 100644 (file)
--- a/iokit/Drivers/platform/drvAppleNMI/AppleNMI.cpp
+++ b/iokit/Drivers/platform/drvAppleNMI/AppleNMI.cpp
@@ -1,29 +1,34 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@

  * 
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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
+ * 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.  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.
  * file.

- * 
- * The 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
+ *
+ * The 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.
  * limitations under the License.

- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@

  */
 /*
  */
 /*

- * Copyright (c) 1998-9 Apple Computer, Inc.  All rights reserved.
+ * Copyright (c) 1998-2003 Apple Computer, Inc.  All rights reserved.

  *
  *  DRI: Josh de Cesare
  *
  *
  *  DRI: Josh de Cesare
  *


@@ -55,7 +60,7 @@ OSMetaClassDefineReservedUnused(AppleNMI,  3);
 
 bool AppleNMI::start(IOService *provider)
 {
 
 bool AppleNMI::start(IOService *provider)
 {

-  if (!super::init()) return false;
+  if (!super::start(provider)) return false;

 
   enable_debugger = FALSE;
   mask_NMI = FALSE;
 
   enable_debugger = FALSE;
   mask_NMI = FALSE;


@@ -92,18 +97,6 @@ bool RootRegistered( OSObject * us, void *, IOService * yourDevice )
 
 IOReturn AppleNMI::initNMI(IOInterruptController *parentController, OSData *parentSource)
 {
 
 IOReturn AppleNMI::initNMI(IOInterruptController *parentController, OSData *parentSource)
 {

-  // Allocate the IOInterruptSource so this can act like a nub.
-  _interruptSources = (IOInterruptSource *)IOMalloc(sizeof(IOInterruptSource));
-  if (_interruptSources == 0) return kIOReturnNoMemory;
-  _numInterruptSources = 1;
-  
-  // Set up the IOInterruptSource to point at this.
-  _interruptSources[0].interruptController = parentController;
-  _interruptSources[0].vectorData = parentSource;
-  
-  // call start using itself as its provider.
-  if (!start(this)) return kIOReturnError;
-  

   return kIOReturnSuccess;
 }
 
   return kIOReturnSuccess;
 }
 


@@ -132,33 +125,29 @@ IOReturn AppleNMI::powerStateWillChangeTo ( IOPMPowerFlags theFlags, unsigned lo
     {
         if ( ! (theFlags & IOPMPowerOn) )
         {
     {
         if ( ! (theFlags & IOPMPowerOn) )
         {

-            IOLog("AppleNMI mask NMI\n");
-

             // Mask NMI and change from edge to level whilst sleeping (copied directly from OS9 code)
             nmiIntSourceAddr = (volatile unsigned long *)kExtInt9_NMIIntSource;
             // Mask NMI and change from edge to level whilst sleeping (copied directly from OS9 code)
             nmiIntSourceAddr = (volatile unsigned long *)kExtInt9_NMIIntSource;

-            nmiIntSource = *nmiIntSourceAddr;
+            nmiIntSource = ml_phys_read(nmiIntSourceAddr);

             nmiIntSource |= kNMIIntLevelMask;
             nmiIntSource |= kNMIIntLevelMask;

-            *nmiIntSourceAddr = nmiIntSource;
+            ml_phys_write(nmiIntSourceAddr, nmiIntSource);

             eieio();
             nmiIntSource |= kNMIIntMask;
             eieio();
             nmiIntSource |= kNMIIntMask;

-            *nmiIntSourceAddr = nmiIntSource;
+            ml_phys_write(nmiIntSourceAddr, nmiIntSource);

             eieio();
         }
         else
         {
             eieio();
         }
         else
         {

-            IOLog("AppleNMI unmask NMI\n");
-

             // Unmask NMI and change back to edge (copied directly from OS9 code)
             nmiIntSourceAddr = (volatile unsigned long *)kExtInt9_NMIIntSource;
             // Unmask NMI and change back to edge (copied directly from OS9 code)
             nmiIntSourceAddr = (volatile unsigned long *)kExtInt9_NMIIntSource;

-            nmiIntSource = *nmiIntSourceAddr;
+            nmiIntSource = ml_phys_read(nmiIntSourceAddr);

             nmiIntSource &= ~kNMIIntLevelMask;
             nmiIntSource &= ~kNMIIntLevelMask;

-            *nmiIntSourceAddr = nmiIntSource;
+            ml_phys_write(nmiIntSourceAddr, nmiIntSource);

             eieio();
             nmiIntSource &= ~kNMIIntMask;
             eieio();
             nmiIntSource &= ~kNMIIntMask;

-            *nmiIntSourceAddr = nmiIntSource;
+            ml_phys_write(nmiIntSourceAddr, nmiIntSource);

             eieio();
         }
     }
             eieio();
         }
     }

-
+    

     return IOPMAckImplied;
 }
     return IOPMAckImplied;
 }