summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2013-02-08 17:40:04 -0800
committerJim P <jim@pingle.org>2013-02-08 17:40:04 -0800
commit82cc8a36d365acf1471359be3a4034bf35381bda (patch)
tree4a051dcae7463ec34ffb8efb04123890b342fd90 /usr/local
parenta06edef60096824e0ac817629c16a55a213f8da1 (diff)
parenta358eec2aecf523fdb623dd4ac529a8764355a86 (diff)
downloadpfsense-82cc8a36d365acf1471359be3a4034bf35381bda.zip
pfsense-82cc8a36d365acf1471359be3a4034bf35381bda.tar.gz
Merge pull request #395 from N0YB/PowerD_AC_BAT_Modes
System: Advanced: Miscellaneous: PowerD
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/system_advanced_misc.php34
1 files changed, 23 insertions, 11 deletions
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index d3243bc..c9216d4 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -69,10 +69,13 @@ $pconfig['thermal_hardware'] = $config['system']['thermal_hardware'];
$pconfig['schedule_states'] = isset($config['system']['schedule_states']);
$pconfig['kill_states'] = isset($config['system']['kill_states']);
-if (!empty($config['system']['powerd_mode']))
- $pconfig['powerd_mode'] = $config['system']['powerd_mode'];
-else
- $pconfig['powerd_mode'] = "hadp";
+$pconfig['powerd_ac_mode'] = "hadp";
+if (!empty($config['system']['powerd_ac_mode']))
+ $pconfig['powerd_ac_mode'] = $config['system']['powerd_ac_mode'];
+
+$pconfig['powerd_battery_mode'] = "hadp";
+if (!empty($config['system']['powerd_battery_mode']))
+ $pconfig['powerd_battery_mode'] = $config['system']['powerd_battery_mode'];
$crypto_modules = array('glxsb' => gettext("AMD Geode LX Security Block"),
'aesni' => gettext("AES-NI CPU-based Acceleration"));
@@ -172,7 +175,8 @@ if ($_POST) {
else
unset($config['system']['powerd_enable']);
- $config['system']['powerd_mode'] = $_POST['powerd_mode'];
+ $config['system']['powerd_ac_mode'] = $_POST['powerd_ac_mode'];
+ $config['system']['powerd_battery_mode'] = $_POST['powerd_battery_mode'];
if($_POST['crypto_hardware'])
$config['system']['crypto_hardware'] = $_POST['crypto_hardware'];
@@ -350,12 +354,20 @@ function maxmss_checked(obj) {
<input name="powerd_enable" type="checkbox" id="powerd_enable" value="yes" <?php if ($pconfig['powerd_enable']) echo "checked"; ?> />
<strong><?=gettext("Use PowerD"); ?></strong><br/>
<br/>
- <?=gettext("Mode"); ?>&nbsp;:&nbsp;
- <select name="powerd_mode" id="powerd_mode">
- <option value="hadp"<?php if($pconfig['powerd_mode']=="hadp") echo " selected"; ?>><?=gettext("Hiadaptive");?></option>
- <option value="adp"<?php if($pconfig['powerd_mode']=="adp") echo " selected"; ?>><?=gettext("Adaptive");?></option>
- <option value="min"<?php if($pconfig['powerd_mode']=="min") echo " selected"; ?>><?=gettext("Minimum");?></option>
- <option value="max"<?php if($pconfig['powerd_mode']=="max") echo " selected"; ?>><?=gettext("Maximum");?></option>
+ <?=gettext("On AC Power Mode"); ?>&nbsp;:&nbsp;
+ <select name="powerd_ac_mode" id="powerd_ac_mode">
+ <option value="hadp"<?php if($pconfig['powerd_ac_mode']=="hadp") echo " selected"; ?>><?=gettext("Hiadaptive");?></option>
+ <option value="adp"<?php if($pconfig['powerd_ac_mode']=="adp") echo " selected"; ?>><?=gettext("Adaptive");?></option>
+ <option value="min"<?php if($pconfig['powerd_ac_mode']=="min") echo " selected"; ?>><?=gettext("Minimum");?></option>
+ <option value="max"<?php if($pconfig['powerd_ac_mode']=="max") echo " selected"; ?>><?=gettext("Maximum");?></option>
+ </select>
+ &nbsp;&nbsp;
+ <?=gettext("On Battery Power Mode"); ?>&nbsp;:&nbsp;
+ <select name="powerd_battery_mode" id="powerd_battery_mode">
+ <option value="hadp"<?php if($pconfig['powerd_battery_mode']=="hadp") echo " selected"; ?>><?=gettext("Hiadaptive");?></option>
+ <option value="adp"<?php if($pconfig['powerd_battery_mode']=="adp") echo " selected"; ?>><?=gettext("Adaptive");?></option>
+ <option value="min"<?php if($pconfig['powerd_battery_mode']=="min") echo " selected"; ?>><?=gettext("Minimum");?></option>
+ <option value="max"<?php if($pconfig['powerd_battery_mode']=="max") echo " selected"; ?>><?=gettext("Maximum");?></option>
</select>
<br/><br/>
<?=gettext("The powerd utility monitors the system state and sets various power control " .
OpenPOWER on IntegriCloud