/*
* Copyright (c) 1999-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_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 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.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* Copyright (c) 1999-2000 Apple Computer, Inc. All rights reserved.
gIOCPUs->setObject(this);
// Correct the bus, cpu and timebase frequencies in the device tree.
- if (gPEClockFrequencyInfo.bus_frequency_hz < 0x100000000ULL)
- busFrequency = OSData::withBytesNoCopy((void *)((char *)&gPEClockFrequencyInfo.bus_frequency_hz + 4), 4);
- else
- busFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.bus_clock_rate_hz, 8);
+ if (gPEClockFrequencyInfo.bus_frequency_hz < 0x100000000ULL) {
+ busFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.bus_clock_rate_hz, 4);
+ } else {
+ busFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.bus_frequency_hz, 8);
+ }
provider->setProperty("bus-frequency", busFrequency);
busFrequency->release();
- if (gPEClockFrequencyInfo.cpu_frequency_hz < 0x100000000ULL)
- cpuFrequency = OSData::withBytesNoCopy((void *)((char *)&gPEClockFrequencyInfo.cpu_frequency_hz + 4), 4);
- else
- cpuFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.cpu_clock_rate_hz, 8);
+ if (gPEClockFrequencyInfo.cpu_frequency_hz < 0x100000000ULL) {
+ cpuFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.cpu_clock_rate_hz, 4);
+ } else {
+ cpuFrequency = OSData::withBytesNoCopy((void *)&gPEClockFrequencyInfo.cpu_frequency_hz, 8);
+ }
provider->setProperty("clock-frequency", cpuFrequency);
cpuFrequency->release();
provider->setProperty("timebase-frequency", timebaseFrequency);
timebaseFrequency->release();
- setProperty("IOCPUID", (UInt32)this, 32);
+ super::setProperty("IOCPUID", (UInt32)this, 32);
setCPUNumber(0);
setCPUState(kIOCPUStateUnregistered);
return true;
}
-IOReturn IOCPU::setProperties(OSObject *properties)
+OSObject *IOCPU::getProperty(const OSSymbol *aKey) const
{
- OSDictionary *dict = OSDynamicCast(OSDictionary, properties);
- OSString *stateStr;
- IOReturn result;
+ if (aKey == gIOCPUStateKey) return gIOCPUStateNames[_cpuState];
- if (dict == 0) return kIOReturnUnsupported;
+ return super::getProperty(aKey);
+}
+
+bool IOCPU::setProperty(const OSSymbol *aKey, OSObject *anObject)
+{
+ OSString *stateStr;
- stateStr = OSDynamicCast(OSString, dict->getObject(gIOCPUStateKey));
- if (stateStr != 0) {
- result = IOUserClient::clientHasPrivilege(current_task(), kIOClientPrivilegeAdministrator);
- if (result != kIOReturnSuccess) return result;
+ if (aKey == gIOCPUStateKey) {
+ stateStr = OSDynamicCast(OSString, anObject);
+ if (stateStr == 0) return false;
- if (_cpuNumber == 0) return kIOReturnUnsupported;
+ if (_cpuNumber == 0) return false;
if (stateStr->isEqualTo("running")) {
if (_cpuState == kIOCPUStateStopped) {
processor_start(machProcessor);
} else if (_cpuState != kIOCPUStateRunning) {
- return kIOReturnUnsupported;
+ return false;
}
} else if (stateStr->isEqualTo("stopped")) {
if (_cpuState == kIOCPUStateRunning) {
haltCPU();
} else if (_cpuState != kIOCPUStateStopped) {
- return kIOReturnUnsupported;
+ return false;
}
- } else return kIOReturnUnsupported;
+ } else return false;
- return kIOReturnSuccess;
+ return true;
+ }
+
+ return super::setProperty(aKey, anObject);
+}
+
+bool IOCPU::serializeProperties(OSSerialize *serialize) const
+{
+ bool result;
+ OSDictionary *dict = dictionaryWithProperties();
+ dict->setObject(gIOCPUStateKey, gIOCPUStateNames[_cpuState]);
+ result = dict->serialize(serialize);
+ dict->release();
+ return result;
+}
+
+IOReturn IOCPU::setProperties(OSObject *properties)
+{
+ OSDictionary *dict = OSDynamicCast(OSDictionary, properties);
+ OSString *stateStr;
+ IOReturn result;
+
+ if (dict == 0) return kIOReturnUnsupported;
+
+ stateStr = OSDynamicCast(OSString, dict->getObject(gIOCPUStateKey));
+ if (stateStr != 0) {
+ result = IOUserClient::clientHasPrivilege(current_task(), kIOClientPrivilegeAdministrator);
+ if (result != kIOReturnSuccess) return result;
+
+ if (setProperty(gIOCPUStateKey, stateStr)) return kIOReturnSuccess;
+
+ return kIOReturnUnsupported;
}
return kIOReturnUnsupported;
void IOCPU::setCPUNumber(UInt32 cpuNumber)
{
_cpuNumber = cpuNumber;
- setProperty("IOCPUNumber", _cpuNumber, 32);
+ super::setProperty("IOCPUNumber", _cpuNumber, 32);
}
UInt32 IOCPU::getCPUState(void)
void IOCPU::setCPUState(UInt32 cpuState)
{
- if ((cpuState >= 0) && (cpuState < kIOCPUStateCount)) {
+ if (cpuState < kIOCPUStateCount) {
_cpuState = cpuState;
- setProperty(gIOCPUStateKey, gIOCPUStateNames[cpuState]);
}
}
void IOCPUInterruptController::enableCPUInterrupt(IOCPU *cpu)
{
- ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this,
- (IOInterruptHandler)&IOCPUInterruptController::handleInterrupt, 0);
+ IOInterruptHandler handler = OSMemberFunctionCast(
+ IOInterruptHandler, this, &IOCPUInterruptController::handleInterrupt);
+
+ ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this, handler, 0);
enabledCPUs++;