diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-17 13:21:54 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-17 13:21:54 -0400 |
| commit | 3813b883e1c59ed5983ea8b6d9bfc12bcabd81d1 (patch) | |
| tree | 0957dcb0699ffeb708b99267a6fb4fb49d4040ca /pts-core/functions/pts-functions_system.php | |
| parent | 91738453eaaa3f2d7a28ca6d5a4bc4a3c4a80d8c (diff) | |
| download | phoronix-test-suite-upstream-3813b883e1c59ed5983ea8b6d9bfc12bcabd81d1.tar.gz phoronix-test-suite-upstream-3813b883e1c59ed5983ea8b6d9bfc12bcabd81d1.tar.xz phoronix-test-suite-upstream-3813b883e1c59ed5983ea8b6d9bfc12bcabd81d1.zip | |
pts-core: Switch read_sensors() calls to using the new structure where
relevant
Diffstat (limited to 'pts-core/functions/pts-functions_system.php')
| -rw-r--r-- | pts-core/functions/pts-functions_system.php | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/pts-core/functions/pts-functions_system.php b/pts-core/functions/pts-functions_system.php index 7496485..45296fe 100644 --- a/pts-core/functions/pts-functions_system.php +++ b/pts-core/functions/pts-functions_system.php @@ -233,10 +233,7 @@ function pts_vendor_identifier() } function system_temperature() { - $temp_c = read_sensors("Sys Temp"); - - if(empty($temp_c)) - $temp_c = read_sensors("Board Temp"); + $temp_c = read_sensors(array("Sys Temp", "Board Temp")); if(empty($temp_c)) { @@ -256,26 +253,11 @@ function system_line_voltage($type) if($type == "CPU") $voltage = read_sensors("VCore"); else if($type == "V3") - { - $voltage = read_sensors("V3.3"); - - if(empty($voltage)) - $voltage = read_sensors("+3.3V"); - } + $voltage = read_sensors(array("V3.3", "+3.3V")); else if($type == "V5") - { - $voltage = read_sensors("V5"); - - if(empty($voltage)) - $voltage = read_sensors("+5V"); - } + $voltage = read_sensors(array("V5", "+5V")); else if($type == "V12") - { - $voltage = read_sensors("V12"); - - if(empty($voltage)) - $voltage = read_sensors("+12V"); - } + $voltage = read_sensors(array("V12", "+12V")); else $voltage = ""; |