From a7345566479a043030510a643043579a4f97a712 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Wed, 6 Sep 2023 11:20:55 +0200
Subject: [PATCH] [no ci] Overlay: update wireless scripts (#982)

---
 .../overlay/etc/network/interfaces.d/wlan0    |  2 +-
 general/overlay/etc/wireless/interfaces/wlan0 |  2 +-
 general/overlay/etc/wireless/modem            |  1 -
 general/overlay/etc/wireless/sdio             | 23 +++----------------
 general/overlay/etc/wireless/usb              |  1 -
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/general/overlay/etc/network/interfaces.d/wlan0 b/general/overlay/etc/network/interfaces.d/wlan0
index 071167f0..a56f8468 100644
--- a/general/overlay/etc/network/interfaces.d/wlan0
+++ b/general/overlay/etc/network/interfaces.d/wlan0
@@ -1,5 +1,5 @@
 iface wlan0 inet dhcp
-    pre-up wlan_addr=$(fw_printenv -n wlanaddr); if [ -n "$wlan_addr" ]; then ip link set dev wlan0 address $wlan_addr; fi
+    pre-up wlan_addr=$(fw_printenv -n wlanaddr) && ip link set dev wlan0 address $wlan_addr
     post-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
     post-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
     post-up wpa_supplicant -B -i wlan0 -D nl80211,wext -c /tmp/wpa_supplicant.conf
diff --git a/general/overlay/etc/wireless/interfaces/wlan0 b/general/overlay/etc/wireless/interfaces/wlan0
index 6879fdc4..dca383e2 100644
--- a/general/overlay/etc/wireless/interfaces/wlan0
+++ b/general/overlay/etc/wireless/interfaces/wlan0
@@ -1,6 +1,6 @@
 auto wlan0
 iface wlan0 inet dhcp
-    pre-up wlan_addr=$(fw_printenv -n wlanaddr); if [ -n "$wlan_addr" ]; then ip link set dev wlan0 address $wlan_addr; fi
+    pre-up wlan_addr=$(fw_printenv -n wlanaddr) && ip link set dev wlan0 address $wlan_addr
     post-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
     post-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
     post-up wpa_supplicant -B -i wlan0 -D nl80211,wext -c /tmp/wpa_supplicant.conf
diff --git a/general/overlay/etc/wireless/modem b/general/overlay/etc/wireless/modem
index 5ec5e4ce..335ed76b 100755
--- a/general/overlay/etc/wireless/modem
+++ b/general/overlay/etc/wireless/modem
@@ -4,7 +4,6 @@ set_gpio() {
 	echo $1 > /sys/class/gpio/export
 	echo out > /sys/class/gpio/gpio$1/direction
 	echo $2 > /sys/class/gpio/gpio$1/value
-	echo $1 > /sys/class/gpio/unexport
 	sleep 1
 }
 
diff --git a/general/overlay/etc/wireless/sdio b/general/overlay/etc/wireless/sdio
index 9b8d6aa4..6446c90c 100755
--- a/general/overlay/etc/wireless/sdio
+++ b/general/overlay/etc/wireless/sdio
@@ -4,7 +4,6 @@ set_gpio() {
 	echo $1 > /sys/class/gpio/export
 	echo out > /sys/class/gpio/gpio$1/direction
 	echo $2 > /sys/class/gpio/gpio$1/value
-	echo $1 > /sys/class/gpio/unexport
 	sleep 1
 }
 
@@ -17,30 +16,26 @@ set_mmc() {
 
 # T31 ATBM603X mmc0
 if [ "$1" = "atbm603x-t31-mmc0" ]; then
-	# PB10 in wifi mmc1 is in the pull-down state by default, it needs to be set to a high-impedance state
+	# PB10 wifi mmc1, pull-down -> high-impedance
 	devmem 0x10011128 32 0x400
-	# set wifi mmc1 clk drive capability to 8mA
+	# Set wifi mmc1 clk drive capability to 8mA
 	devmem 0x10011134 32 0x20000
-
 	set_mmc 0
 
 	cp /usr/share/atbm603x_conf/atbm_txpwer_dcxo_cfg.txt /tmp
 	cp /usr/share/atbm603x_conf/set_rate_power.txt /tmp
-
 	modprobe atbm603x_wifi_sdi0 atbm_printk_mask=0
 	exit 0
 fi
 
 # T31 ATBM603X mmc1
 if [ "$1" = "atbm603x-t31-mmc1" ]; then
-	# not sure what this does, but it's copied from the stock fw
+	# Copied from stock firmware
 	devmem 0x10011110 32 0x6e094800
-
 	set_mmc 1
 
 	cp /usr/share/atbm603x_conf/atbm_txpwer_dcxo_cfg.txt /tmp
 	cp /usr/share/atbm603x_conf/set_rate_power.txt /tmp
-
 	modprobe atbm603x_wifi_sdi1 atbm_printk_mask=0
 	exit 0
 fi
@@ -48,52 +43,40 @@ fi
 # T31 Wyze V3 / AtomCam 2 ATBM603x
 if [ "$1" = "atbm603x-t31-wyze-v3" ]; then
 	set_gpio 57 1
-
 	set_mmc 1
 
 	cp /usr/share/atbm603x_conf/atbm_txpwer_dcxo_cfg.txt /tmp
 	cp /usr/share/atbm603x_conf/set_rate_power.txt /tmp
-
 	modprobe atbm603x_wifi_sdi1 atbm_printk_mask=0
-	sleep 1
 	exit 0
 fi
 
 # T31 Wyze V3 RTL8189FTV
 if [ "$1" = "rtl8189ftv-t31-wyze-v3" ]; then
 	set_gpio 57 1
-
 	set_mmc 1
-
 	modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0
-	sleep 1
 	exit 0
 fi
 
 # T31 Wyze DB3 RTL8189FTV
 if [ "$1" = "rtl8189ftv-t31-wyze-db3" ]; then
 	set_mmc 1
-
 	modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0
-	sleep 1
 	exit 0
 fi
 
 # T20 Wyze V2 RTL8189FTV
 if [ "$1" = "rtl8189ftv-t20-wyze-v2" ]; then
 	set_mmc 1
-
 	modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0
-	sleep 1
 	exit 0
 fi
 
 # T20 Wyze PanV1 RTL8189ES
 if [ "$1" = "rtl8189ftv-t20-wyze-pan-v1" ]; then
 	set_mmc 1
-
 	modprobe 8189es rtw_power_mgnt=0 rtw_enusbss=0
-	sleep 1
 	exit 0
 fi
 
diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb
index a8fb8da0..67d39c4e 100755
--- a/general/overlay/etc/wireless/usb
+++ b/general/overlay/etc/wireless/usb
@@ -4,7 +4,6 @@ set_gpio() {
 	echo $1 > /sys/class/gpio/export
 	echo out > /sys/class/gpio/gpio$1/direction
 	echo $2 > /sys/class/gpio/gpio$1/value
-	echo $1 > /sys/class/gpio/unexport
 	sleep 1
 }