hal: Branch 'master'

[David Zeuthen]

 tools/linux/hal-system-killswitch-set-power-linux |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

New commits:
diff-tree de830cac4e4e4dcf4a21fbd08b12b87bbda1057f (from ecc0342a2ebca8b1c5fa802385c8721feee7ada6)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Mar 25 23:22:41 2007 -0400

    for Dell, disable physical killswitch when setting power
    
    If we don't do this we can't turn on the power.

diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
index b207372..ef1785f 100755
--- a/tools/linux/hal-system-killswitch-set-power-linux
+++ b/tools/linux/hal-system-killswitch-set-power-linux
@@ -17,12 +17,15 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
 	fi
 	exit 0
     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+
+	# As a side effect we disable the physical kill switch
+
 	# TODO: write our own binary that links with libsmbios?
 	if [ "$value" = "true" ]; then
-	    dellWirelessCtl --bt 1
+	    dellWirelessCtl --sw_bt 0 --bt 1
 	    ret=$?
 	else
-	    dellWirelessCtl --bt 0
+	    dellWirelessCtl --sw_bt 0 --bt 0
 	    ret=$?
 	fi
 	if [ "$ret" != "0" ]; then
@@ -36,12 +39,15 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
     fi
 elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+
+	# As a side effect we disable the physical kill switch
+
 	# TODO: write our own binary that links with libsmbios?
 	if [ "$value" = "true" ]; then
-	    dellWirelessCtl --wlan 1
+	    dellWirelessCtl --sw_wlan 0 --wlan 1
 	    ret=$?
 	else
-	    dellWirelessCtl --wlan 0
+	    dellWirelessCtl --sw_wlan 0 --wlan 0
 	    ret=$?
 	fi
 	if [ "$ret" != "0" ]; then