hal: Branch 'master'

[Danny Kukawka]

 tools/linux/hal-system-killswitch-set-power-linux |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 7c3c6fc0b2e6dbff27dfe8663a74bd4411e13875
Author: Mario Limonciello <mario_limonciello at dell.com>
Date:   Fri Oct 24 10:38:24 2008 +0200

    fix Dell bluetooth killswitch
    
    Fixed Dell Bluetooth killswitch handling to not use the --sw_bt command.
    
    From http://thread.gmane.org/gmane.comp.freedesktop.hal/12283:
    
    [Mario Limonciello <mario_limonciello at dell.com>]:
    > I've been trying to track down why on some machines the hardware BT
    > switch suddenly stops working periodically and then figured out what's
    > actually happening.  HAL is turning it off every time.  Well
    > unfortunately, on a lot of Dell platforms, the software switch simply
    > doesn't work.  This is a BIOS limitation on those platforms.  What
    > happens then is somehow this kill switch interface gets triggered, turns
    > off the hardware switch, and suddenly the user has no way to turn
    > bluetooth back on.  I feel the better solution is to only turn off via
    > the software switch.  If the platform ends up supporting it, it will
    > work, if not, nothing happens.
    
    [Michael_E_Brown at dell.com]:
    > I wrote dellWirelessCtl a long time ago and I remember running into
    > one limitation with setting switch settings, but I dont remember the
    > exact details (a BIOS limitation). Something like changing the switch
    > settings always turned BT on or off. It was a BIOS bug or limitation
    > or whatever you want to call it. But the solution would most likely be
    > to adjust what HAL is doing as suggested by Mario. I've been messing
    > with it on my system for a little bit to try to remember what the
    > problem was, but I cant get the exact sequence that hits what I
    > remember hitting.

diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
index f160c66..1420c69 100755
--- a/tools/linux/hal-system-killswitch-set-power-linux
+++ b/tools/linux/hal-system-killswitch-set-power-linux
@@ -25,14 +25,12 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
 	exit 0
     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
 	if [ -x "$DELL_WCTL" ]; then
-	    # As a side effect we disable the physical kill switch
-
 	    # TODO: write our own binary that links with libsmbios?
 	    if [ "$value" = "true" ]; then
-	        $DELL_WCTL --sw_bt 0 --bt 1
+	        $DELL_WCTL --bt 1
 	        ret=$?
 	    else
-	        $DELL_WCTL --sw_bt 0 --bt 0
+	        $DELL_WCTL --bt 0
 	        ret=$?
 	    fi
 	    if [ "$ret" != "0" ]; then