mirror/smcFanControl
1
0
Fork 1
mirror of https://github.com/hholtmann/smcFanControl.git synced 2025-11-04 19:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Additional merging

Browse Source
This commit is contained in:
Hendrik Holtmann
2014-02-10 01:57:21 +01:00
parent 7383e0819e
commit 595fcd5957
4 changed files with 15 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
smc-command/smc.c
View File

@ -69,17 +69,17 @@ float _strtof(unsigned char *str, int size, int e)
{
float total = 0;
int i;
for (i = 0; i < size; i++)
{
if (i == (size - 1))
total += (str[i] & 0xff) >> e;
total += (str[i] & 0xff) >> e;
else
total += str[i] << (size - 1 - i) * (8 - e);
total += str[i] << (size - 1 - i) * (8 - e);
}
total += (str[size-1] & 0x03) * 0.25;
return total;
}
@ -270,9 +270,8 @@ void printVal(SMCVal_t val)
printf("no data\n");
}
}
=======
#pragma mark Shared SMC functions
>>>>>>> 3328c0018f364d7873b2aabaeb4284f19d586cb0
kern_return_t SMCOpen(io_connect_t *conn)
{
@ -419,47 +418,6 @@ void smc_init(){
void smc_close(){
SMCClose(g_conn);
}
void printFPE2(SMCVal_t val)
{
/* FIXME: This decode is incomplete, last 2 bits are dropped */
printf("%.0f ", _strtof(val.bytes, val.dataSize, 2));
}
void printUInt(SMCVal_t val)
{
printf("%u ", (unsigned int) _strtoul(val.bytes, val.dataSize, 10));
}
void printBytesHex(SMCVal_t val)
{
int i;
printf("(bytes");
for (i = 0; i < val.dataSize; i++)
printf(" %02x", (unsigned char) val.bytes[i]);
printf(")\n");
}
void printVal(SMCVal_t val)
{
printf(" %-4s [%-4s] ", val.key, val.dataType);
if (val.dataSize > 0)
{
if ((strcmp(val.dataType, DATATYPE_UINT8) == 0) ||
(strcmp(val.dataType, DATATYPE_UINT16) == 0) ||
(strcmp(val.dataType, DATATYPE_UINT32) == 0))
printUInt(val);
else if (strcmp(val.dataType, DATATYPE_FPE2) == 0)
printFPE2(val);
printBytesHex(val);
}
else
{
printf("no data\n");
}
}
kern_return_t SMCCall(int index, SMCKeyData_t *inputStructure, SMCKeyData_t *outputStructure)
{

2
smc-command/smc.h
View File

@ -115,7 +115,7 @@ typedef struct {
} SMCVal_t;
UInt32 _strtoul(char *str, int size, int base);
float _strtof(char *str, int size, int e);
float _strtof(unsigned char *str, int size, int e);
// Exclude command-line only code from smcFanControl UI
#ifdef CMD_TOOL

16
smcFanControl.xcodeproj/project.pbxproj
View File

@ -438,7 +438,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = CMD_TOOL;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
@ -446,7 +446,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
};
name = Debug;
};
@ -463,14 +463,14 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = CMD_TOOL;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
};
name = Release;
};
@ -489,7 +489,7 @@
GCC_MODEL_PPC64 = NO;
GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
INFOPLIST_FILE = Info.plist;
@ -502,7 +502,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = smcFanControl;
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
@ -522,7 +522,7 @@
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = "";
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
INFOPLIST_FILE = Info.plist;
@ -535,7 +535,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = smcFanControl;
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = app;
};

BIN
smcFanControl.xcodeproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.