Merge init_radio_devices() and set_radio_devices_state(),

debug output for radio state after rfkill and after nmcli.
linrunner · Jan 6, 2015 · f0e9ff5 · f0e9ff5
1 parent 2e4a3af
commit f0e9ff5
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 63 deletions.
diff --git a/thinkpad-radiosw.sh b/thinkpad-radiosw.sh
@@ -41,6 +41,6 @@ done
 
 # Disable configured radios
 echo_debug "rf" "thinkpad-radiosw: on"
-init_radio_devices radiosw
+set_radio_devices_state radiosw
 
 exit 0
diff --git a/tlp b/tlp
@@ -48,7 +48,11 @@ apply_common_settings () { # apply settings common to all modes
     disable_wake_on_lan
     set_sound_power_mode $1
     set_runtime_pm $1
-    set_radio_devices_state $1
+    if [ "$1" = "1" ]; then
+        set_radio_devices_state bat
+    else
+        set_radio_devices_state ac
+    fi
 
     return 0
 }
@@ -99,7 +103,7 @@ case "$mode" in
                 load_modules
                 echo "done. "
 
-                init_radio_devices start
+                set_radio_devices_state start
 
                 echo -n "Setting battery charge thresholds..."
                 set_charge_thresholds
@@ -114,7 +118,7 @@ case "$mode" in
                 ;;
 
             stop)
-                init_radio_devices stop
+                set_radio_devices_state stop
 
                 if [ "$USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN" = "1" ]; then
                     echo -n "Disabling usb autosuspend..."

diff --git a/tlp-rf-func b/tlp-rf-func
@@ -123,13 +123,15 @@ device_on () { # enable radio type -- $1: rftype
             if test_rfkill_perms ; then
                 echo_debug "rf" "device_on($1).rfkill"
                 $RFKILL unblock $1 > /dev/null 2>&1
+                get_devs $1
             else
                 err_no_root_priv "device_on($1).rfkill"
             fi
         else
             if test_root ; then
                 echo_debug "rf" "device_on($1).devc"
                 echo -n $devon > $devc
+                get_devs $1
             else
                 err_no_root_priv "device_on($1).devc"
             fi
@@ -142,12 +144,11 @@ device_on () { # enable radio type -- $1: rftype
             wifi|wwan)
                 $NMCLI nm $1 on > /dev/null 2>&1
                 echo_debug "rf" "device_on($1).nmcli"
+                get_devs $1
                 ;;
         esac
     fi
 
-    get_devs $1
-
     return 0
 }
 
@@ -168,13 +169,15 @@ device_off () { # disable radio type -- $1: rftype
             if test_rfkill_perms ; then
                 echo_debug "rf" "device_off($1).rfkill"
                 $RFKILL block $1 > /dev/null 2>&1
+                get_devs $1
             else
                 err_no_root_priv "device_off($1).rfkill"
             fi
         else
             if test_root ; then
                 echo_debug "rf" "device_off($1).devc"
                 echo -n $devoff > $devc
+                get_devs $1
             else
                 err_no_root_priv "device_off($1).devc"
             fi
@@ -187,12 +190,11 @@ device_off () { # disable radio type -- $1: rftype
             wifi|wwan)
                 $NMCLI nm $1 off > /dev/null 2>&1
                 echo_debug "rf" "device_off($1).nmcli"
+                get_devs $1
                 ;;
         esac
     fi
 
-    get_devs $1
-
     return 0
 }
 
@@ -216,6 +218,7 @@ device_toggle () { # toggle radio type state -- $1: rftype
                 1) $RFKILL block $1   > /dev/null 2>&1 ;;
                 *) ;;
             esac
+            get_devs $1
         else
             err_no_root_priv "device_toogle($1).rfkill"
         fi
@@ -227,6 +230,7 @@ device_toggle () { # toggle radio type state -- $1: rftype
                 1) echo -n $devoff > $devc ;;
                 *) ;;
             esac
+            get_devs $1
         else
             err_no_root_priv "device_toogle($1).devc"
         fi
@@ -242,12 +246,11 @@ device_toggle () { # toggle radio type state -- $1: rftype
                     *) ;;
                 esac
                 echo_debug "rf" "device_toggle($1).nmcli"
+                get_devs $1
                 ;;
         esac
     fi
 
-    get_devs $1
-
     return 0
 }
 
@@ -273,6 +276,7 @@ device_set_state () { # set radio type state -- $1: rftype, $2: state 0=off/1=on
                 0) $RFKILL block $1   > /dev/null 2>&1 ;;
                 1) $RFKILL unblock $1 > /dev/null 2>&1 ;;
             esac
+            get_devs $1
         else
             err_no_root_priv "device_set_state($1).rfkill"
         fi
@@ -283,6 +287,7 @@ device_set_state () { # set radio type state -- $1: rftype, $2: state 0=off/1=on
                 0) echo -n $devoff > $devc ;;
                 1) echo -n $devon > $devc ;;
             esac
+            get_devs $1
         else
             err_no_root_priv "device_set_state($1, $2).devc"
         fi
@@ -298,12 +303,11 @@ device_set_state () { # set radio type state -- $1: rftype, $2: state 0=off/1=on
                     *) ;;
                 esac
                 echo_debug "rf" "device_toggle($1).nmcli"
+                get_devs $1
                 ;;
         esac
     fi
 
-    get_devs $1
-
     return 0
 }
 
@@ -387,11 +391,11 @@ restore_device_states () { # restore radio type states
     fi
 }
 
-init_radio_devices () { # initialize all radio type states
-    # $1: start/stop/radiosw
-    # called from init scripts
-
+set_radio_devices_state () { # set/initialize all radio states
+    # $1: start/stop/bat/ac/radiosw
+    # called from init scripts or upon change of power source
     local dev devs2disable devs2enable restore
+    local quiet=0
 
     # save/restore mode is disabled by default
     if [ "$1" != "radiosw" ]; then
@@ -400,7 +404,7 @@ init_radio_devices () { # initialize all radio type states
         restore=0
     fi
 
-    echo_debug "rf" "init_radio_devices($1): restore=$restore"
+    echo_debug "rf" "set_radio_devices_state($1): restore=$restore"
 
     if [ "$restore" = "1" ]; then
         # "save/restore" mode
@@ -420,14 +424,14 @@ init_radio_devices () { # initialize all radio type states
                 ;;
         esac
     else
-        # "disable/enable on startup/shutdown" or "radiosw" mode
+        # "disable/enable on startup/shutdown or bat/ac" or "radiosw" mode
         case $1 in
-            start)
+            start) # system startup
                 devs2disable="$DEVICES_TO_DISABLE_ON_STARTUP"
                 devs2enable="$DEVICES_TO_ENABLE_ON_STARTUP"
                 ;;
 
-            stop)
+            stop) # system shutdown
                 devs2disable="$DEVICES_TO_DISABLE_ON_SHUTDOWN"
                 devs2enable="$DEVICES_TO_ENABLE_ON_SHUTDOWN"
 
@@ -438,6 +442,30 @@ init_radio_devices () { # initialize all radio type states
                 fi
                 ;;
 
+            bat) # battery power --> build disable list
+                quiet=1 # do not display progress
+                devs2enable=""
+                devs2disable="${DEVICES_TO_DISABLE_ON_BAT:-}"
+
+                # check configured list for connected devices
+                for dev in ${DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE:-}; do
+                    case $dev in
+                        bluetooth) any_bluetooth_in_use ;;
+                        wifi) any_wifi_in_use ;;
+                        wwan) any_wwan_in_use ;;
+                    esac
+                    # if device is not connected and not in list yet --> add to disable list
+                    [ $? = 0 ] || wordinlist $dev "$devs2disable" || devs2disable="$dev $devs2disable"
+                done
+                devs2disable="${devs2disable# }"
+                ;;
+
+            ac) # AC power --> build enable list
+                quiet=1 # do not display progress
+                devs2enable="${DEVICES_TO_ENABLE_ON_AC:-}"
+                devs2disable=""
+                ;;
+
             radiosw)
                 devs2disable=""
                 devs2enable="$DEVICES_TO_ENABLE_ON_RADIOSW"
@@ -446,12 +474,12 @@ init_radio_devices () { # initialize all radio type states
 
         # Disable configured radios
         if [ -n "$devs2disable" ]; then
-            echo -n "Disabling radios:"
+            [ "$quiet" = "1" ] || echo -n "Disabling radios:"
             for dev in $devs2disable; do
-                echo -n " $dev"
+                [ "$quiet" = "1" ] || echo -n " $dev"
                 device_off $dev
             done
-            echo "."
+            [ "$quiet" = "1" ] || echo "."
         fi
 
         # Enable configured radios
@@ -465,12 +493,12 @@ init_radio_devices () { # initialize all radio type states
                 done
             else
                 # start mode: enable listed radios
-                echo -n "Enabling radios:"
+                [ "$quiet" = "1" ] || echo -n "Enabling radios:"
                 for dev in $devs2enable; do
-                    echo -n " $dev"
+                    [ "$quiet" = "1" ] || echo -n " $dev"
                     device_on $dev
                 done
-                echo "."
+                [ "$quiet" = "1" ] || echo "."
             fi
         fi
 
@@ -480,40 +508,3 @@ init_radio_devices () { # initialize all radio type states
 
     return 0
 }
-
-set_radio_devices_state () { # set radio devices state depending on power source
-                             # $1: 0=ac mode, 1=battery mode
-    local devs2enable devs2disable dev
-
-    if [ "$1" = "1" ]; then
-        # Battery power --> build disable list
-        devs2enable=""
-        devs2disable="${DEVICES_TO_DISABLE_ON_BAT:-}"
-
-        # Check configured list for connected devices
-        for dev in ${DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE:-}; do
-            case $dev in
-                bluetooth) any_bluetooth_in_use ;;
-                wifi) any_wifi_in_use ;;
-                wwan) any_wwan_in_use ;;
-            esac
-            # If device is not connected and not in list yet --> add to disable list
-            [ $? = 0 ] || wordinlist $dev "$devs2disable" || devs2disable="$dev $devs2disable"
-        done
-        devs2disable="${devs2disable# }"
-    else
-        # AC power --> build enable list
-        devs2enable="${DEVICES_TO_ENABLE_ON_AC:-}"
-        devs2disable=""
-    fi
-
-    echo_debug "rf" "set_radio_devices_state($1).enable: $devs2enable"
-    for dev in $devs2enable; do
-        device_on $dev
-    done
-
-    echo_debug "rf" "set_radio_devices_state($1).disable: $devs2disable"
-    for dev in $devs2disable; do
-        device_off $dev
-    done
-}