Merge "wlan: creat init.flo.wifi.sh prevent wifi turn off fail caused by timing issue." into jb-mr2-dev

This commit is contained in:
Ed Tam 2013-04-27 20:03:42 +00:00 committed by Android (Google) Code Review
commit 65c5c22455
3 changed files with 15 additions and 11 deletions

View File

@ -51,7 +51,8 @@ PRODUCT_COPY_FILES += \
device/asus/flo/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
device/asus/flo/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
device/asus/flo/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
device/asus/flo/WCNSS_qcom_wlan_nv_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin
device/asus/flo/WCNSS_qcom_wlan_nv_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin \
device/asus/flo/init.flo.wifi.sh:system/etc/init.flo.wifi.sh
PRODUCT_COPY_FILES += \
device/asus/flo/snd_soc_msm_2x_Fusion3:system/etc/snd_soc_msm/snd_soc_msm_2x_Fusion3 \

View File

@ -143,16 +143,9 @@ on post-fs-data
# to observe dnsmasq.leases file for dhcp information of soft ap.
chown dhcp system /data/misc/dhcp
write /dev/wcnss_wlan 1
write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
# Create directory used by audio subsystem
mkdir /data/misc/audio 0770 audio audio
# Workaround for conn_init not copying the updated firmware
rm /data/misc/wifi/WCNSS_qcom_cfg.ini
rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
# Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections
# We chown/chmod /persist again so because mount is run as root + defaults
chown system system /persist
@ -415,10 +408,9 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
user camera
group camera system inet input
service conn_init /system/bin/logwrapper /system/bin/conn_init
service wcnss_init /system/bin/sh /system/etc/init.flo.wifi.sh
class main
user system
group system wifi
user root
oneshot
service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x

11
init.flo.wifi.sh Normal file
View File

@ -0,0 +1,11 @@
#!/system/bin/sh
# Workaround for conn_init not copying the updated firmware
rm /data/misc/wifi/WCNSS_qcom_cfg.ini
rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
logwrapper /system/bin/conn_init
echo 1 > /dev/wcnss_wlan
echo 1 > /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr