xnu-792.12.6.tar.gz

[apple/xnu.git] / iokit / Kernel / IOCPU.cpp

diff --git a/iokit/Kernel/IOCPU.cpp b/iokit/Kernel/IOCPU.cpp
index c86d5a2314cec614f879a632bb401b8dfa48471f..64b3a283fe4c40a45167ffa12eaa20f5216bc9cd 100644 (file)
--- a/iokit/Kernel/IOCPU.cpp
+++ b/iokit/Kernel/IOCPU.cpp
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 1999-2000 Apple Computer, Inc.  All rights reserved.
  *
 /*
  * Copyright (c) 1999-2000 Apple Computer, Inc.  All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@

  * 
  * 

- * 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 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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.
+ *
+ * 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.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@

  */
 /*
  * Copyright (c) 1999-2000 Apple Computer, Inc.  All rights reserved.
  */
 /*
  * Copyright (c) 1999-2000 Apple Computer, Inc.  All rights reserved.


@@ -221,12 +229,9 @@ bool IOCPU::setProperty(const OSSymbol *aKey, OSObject *anObject)
 
 bool IOCPU::serializeProperties(OSSerialize *serialize) const
 {
 
 bool IOCPU::serializeProperties(OSSerialize *serialize) const
 {

-       bool result;
-       OSDictionary *dict = dictionaryWithProperties();
-       dict->setObject(gIOCPUStateKey, gIOCPUStateNames[_cpuState]);
-       result = dict->serialize(serialize);
-       dict->release();  
-       return result;
+  super::setProperty(gIOCPUStateKey, gIOCPUStateNames[_cpuState]);
+  
+  return super::serializeProperties(serialize);

 }
 
 IOReturn IOCPU::setProperties(OSObject *properties)
 }
 
 IOReturn IOCPU::setProperties(OSObject *properties)


@@ -389,10 +394,8 @@ void IOCPUInterruptController::setCPUInterruptProperties(IOService *service)
 
 void IOCPUInterruptController::enableCPUInterrupt(IOCPU *cpu)
 {
 
 void IOCPUInterruptController::enableCPUInterrupt(IOCPU *cpu)
 {

-       IOInterruptHandler handler = OSMemberFunctionCast(
-               IOInterruptHandler, this, &IOCPUInterruptController::handleInterrupt);
-
-       ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this, handler, 0);
+  ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this,
+                               (IOInterruptHandler)&IOCPUInterruptController::handleInterrupt, 0);

   
   enabledCPUs++;
   
   
   enabledCPUs++;