Merge branch 'master' of https://github.com/mw9074/smcFanControl into mw9074-master

Conflicts:
	smc-command/smc.c
	smc-command/smc.h
This commit is contained in:
Hendrik Holtmann
2014-02-10 01:47:40 +01:00
6 changed files with 492 additions and 383 deletions

20
smc-command/smc.h Normal file → Executable file
View File

@ -1,6 +1,7 @@
/*
* Apple System Management Control (SMC) Tool
* Copyright (C) 2006 devnull
* Portions Copyright (C) 2013 Michael Wilber
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -114,12 +115,19 @@ typedef struct {
} SMCVal_t;
UInt32 _strtoul(char *str, int size, int base);
kern_return_t SMCOpen(io_connect_t *conn);
kern_return_t SMCReadKey(UInt32Char_t key, SMCVal_t *val);
kern_return_t SMCReadKey2(UInt32Char_t key, SMCVal_t *val,io_connect_t conn);
kern_return_t SMCWriteSimple(UInt32Char_t key,char *wvalue,io_connect_t conn);
kern_return_t SMCClose(io_connect_t conn);
float _strtof(char *str, int size, int e);
// Exclude command-line only code from smcFanControl UI
#ifdef CMD_TOOL
void smc_init();
void smc_close();
kern_return_t SMCReadKey(UInt32Char_t key, SMCVal_t *val);
kern_return_t SMCWriteSimple(UInt32Char_t key,char *wvalue,io_connect_t conn);
#endif //#ifdef CMD_TOOL
kern_return_t SMCOpen(io_connect_t *conn);
kern_return_t SMCClose(io_connect_t conn);
kern_return_t SMCReadKey2(UInt32Char_t key, SMCVal_t *val,io_connect_t conn);
float _strtof(unsigned char *str, int size, int e);