Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

client: fix errors in (currently unused) get_max_cpu_temperature() code for Macintosh 

svn path=/trunk/boinc/; revision=24526
This commit is contained in:
Charlie Fenton 2011-11-04 11:30:57 +00:00
parent b36f19bee1
commit c830ed59c3
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -8104,3 +8104,10 @@ Charlie 5 Nov 2011
mac_build/
boinc.xcodeproj/
project.pbxproj
Charlie 5 Nov 2011
- client: fix errors in (currently unused) get_max_cpu_temperature()
code for Macintosh.
client/
hostinfo_unix.cpp

32
client/hostinfo_unix.cpp
View File

@ -986,25 +986,27 @@ kern_return_t SMCReadKey(UInt32 key, SMCBytes_t val) {
memset(&inputStructure, 0, sizeof(inputStructure));
memset(&outputStructure, 0, sizeof(outputStructure));
memset(val, 0, sizeof(val));
memset(val, 0, sizeof(SMCBytes_t));
inputStructure.key = key;
inputStructure.data8 = SMC_CMD_READ_KEYINFO;
#if MAC_OS_X_VERSION_10_5
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
result = IOConnectCallStructMethod(conn,
KERNEL_INDEX_SMC,
&inputStructure,
sizeof(inputStructure),
&inputStructure,
&structureOutputSize);
&outputStructure,
&structureOutputSize
);
#else
result = IOConnectMethodStructureIStructureO(conn,
KERNEL_INDEX_SMC,
sizeof(inputStructure),
&structureOutputSize,
&inputStructure,
&outputStructure);
&outputStructure
);
#endif
if (result != kIOReturnSuccess) {
return result;
@ -1013,18 +1015,22 @@ kern_return_t SMCReadKey(UInt32 key, SMCBytes_t val) {
inputStructure.keyInfo.dataSize = outputStructure.keyInfo.dataSize;
inputStructure.data8 = SMC_CMD_READ_BYTES;
#if MAC_OS_X_VERSION_10_5
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
result = IOConnectCallStructMethod(conn,
KERNEL_INDEX_SMC,
&inputStructure,
sizeof(inputStructure),
&inputStructure,
&structureOutputSize);
&outputStructure,
&structureOutputSize
);
#else
result = IOConnectMethodStructureIStructureO(
conn, KERNEL_INDEX_SMC, sizeof(inputStructure), &structureOutputSize),
&inputStructure, &outputStructure
);
result = IOConnectMethodStructureIStructureO(conn,
KERNEL_INDEX_SMC,
sizeof(inputStructure),
&structureOutputSize,
&inputStructure,
&outputStructure
);
#endif
if (result != kIOReturnSuccess) {
return result;
@ -1091,7 +1097,7 @@ int get_max_cpu_temperature() {
#else // PowerPC
int GetMaxCPUTemperature() {
int get_max_cpu_temperature() {
return 0;
}