hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 25c1fe2bb9e9984572eb88a197a68249555ff4b4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jan 25 17:08:41 2008 +0100

    fixed Dell WWAN part to work as e.g. WLAN part
    
    Fixed Dell WWAN killswitch part to work as e.g. WLAN part.

diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
index 191cb56..46a5388 100755
--- a/tools/linux/hal-system-killswitch-get-power-linux
+++ b/tools/linux/hal-system-killswitch-get-power-linux
@@ -69,9 +69,9 @@ elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
 	exit 1
     fi
 elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then
+    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
 	# TODO: write our own binary that links with libsmbios?
-	/usr/bin/dellWirelessCtl --st_wwan
+	$DELL_WCTL --st_wwan
 	value=$?
 	if [ "$value" = "0" ]; then
 	    exit 1
diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
index 2a99dde..049bcea 100755
--- a/tools/linux/hal-system-killswitch-set-power-linux
+++ b/tools/linux/hal-system-killswitch-set-power-linux
@@ -77,16 +77,16 @@ elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
 	exit 1
     fi
 elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then
+    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -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
-	    /usr/bin/dellWirelessCtl --sw_wwan 0 --wwan 1
+	    $DELL_WCTL --sw_wwan 0 --wwan 1
 	    ret=$?
 	else
-	    /usr/bin/dellWirelessCtl --sw_wwan 0 --wwan 0
+	    $DELL_WCTL --sw_wwan 0 --wwan 0
 	    ret=$?
 	fi
 	if [ "$ret" != "0" ]; then