land: Get rid of the fm_dl service
Use the TARGET_QCOM_NO_FM_FIRMWARE flag instead to skip everything. Change-Id: Ib6c7d24af12aadec196df6c245cd8ec686eae154
This commit is contained in:
Zhao Wei Liew
parent
ce9e280216
commit
8aceaa92ed
5 changed files with 3 additions and 113 deletions
|
|
@ -1,7 +1,3 @@
|
|||
# Init
|
||||
PRODUCT_PACKAGES += \
|
||||
init.qcom.fm.sh
|
||||
|
||||
# Properties
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.fm.transmitter=false
|
||||
|
|
|
|||
|
|
@ -1114,9 +1114,6 @@ lib64/libfp_client.so
|
|||
lib64/libfpnav.so
|
||||
lib64/libfpservice.so
|
||||
|
||||
# FM
|
||||
bin/fm_qsoc_patches
|
||||
|
||||
# Gatekeeper
|
||||
vendor/lib/hw/gatekeeper.msm8937.so
|
||||
vendor/lib64/hw/gatekeeper.msm8937.so
|
||||
|
|
|
|||
|
|
@ -74,10 +74,3 @@ LOCAL_MODULE_TAGS := optional eng
|
|||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_SRC_FILES := etc/init.qcom.bt.sh
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := init.qcom.fm.sh
|
||||
LOCAL_MODULE_TAGS := optional eng
|
||||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_SRC_FILES := etc/init.qcom.fm.sh
|
||||
include $(BUILD_PREBUILT)
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
#!/system/bin/sh
|
||||
# Copyright (c) 2009-2011, 2015, The Linux Foundation. All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# * Neither the name of The Linux Foundation nor
|
||||
# the names of its contributors may be used to endorse or promote
|
||||
# products derived from this software without specific prior written
|
||||
# permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
setprop hw.fm.init 0
|
||||
|
||||
mode=`getprop hw.fm.mode`
|
||||
version=199217
|
||||
|
||||
LOG_TAG="qcom-fm"
|
||||
LOG_NAME="${0}:"
|
||||
|
||||
loge ()
|
||||
{
|
||||
/system/bin/log -t $LOG_TAG -p e "$LOG_NAME $@"
|
||||
}
|
||||
|
||||
logi ()
|
||||
{
|
||||
/system/bin/log -t $LOG_TAG -p i "$LOG_NAME $@"
|
||||
}
|
||||
|
||||
failed ()
|
||||
{
|
||||
loge "$1: exit code $2"
|
||||
exit $2
|
||||
}
|
||||
|
||||
logi "In FM shell Script"
|
||||
logi "mode: $mode"
|
||||
logi "Version : $version"
|
||||
|
||||
#$fm_qsoc_patches <fm_chipVersion> <enable/disable WCM>
|
||||
#
|
||||
case $mode in
|
||||
"normal")
|
||||
logi "inserting the radio transport module"
|
||||
echo 1 > /sys/module/radio_iris_transport/parameters/fmsmd_set
|
||||
/system/bin/fm_qsoc_patches $version 0
|
||||
;;
|
||||
"wa_enable")
|
||||
/system/bin/fm_qsoc_patches $version 1
|
||||
;;
|
||||
"wa_disable")
|
||||
/system/bin/fm_qsoc_patches $version 2
|
||||
;;
|
||||
*)
|
||||
logi "Shell: Default case"
|
||||
/system/bin/fm_qsoc_patches $version 0
|
||||
;;
|
||||
esac
|
||||
|
||||
exit_code_fm_qsoc_patches=$?
|
||||
|
||||
case $exit_code_fm_qsoc_patches in
|
||||
0)
|
||||
logi "FM QSoC calibration and firmware download succeeded"
|
||||
;;
|
||||
*)
|
||||
failed "FM QSoC firmware download and/or calibration failed" $exit_code_fm_qsoc_patches
|
||||
;;
|
||||
esac
|
||||
|
||||
setprop hw.fm.init 1
|
||||
|
||||
exit 0
|
||||
|
|
@ -254,10 +254,8 @@ on boot
|
|||
chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_btwrite
|
||||
chown system system /sys/module/sco/parameters/disable_esco
|
||||
chown bluetooth bluetooth /sys/module/hci_smd/parameters/hcismd_set
|
||||
chown system system /sys/module/radio_iris_transport/parameters/fmsmd_set
|
||||
chmod 0660 /sys/module/bluetooth_power/parameters/power
|
||||
chmod 0660 /sys/module/hci_smd/parameters/hcismd_set
|
||||
chmod 0660 /sys/module/radio_iris_transport/parameters/fmsmd_set
|
||||
chmod 0660 /sys/class/rfkill/rfkill0/state
|
||||
chmod 0660 /proc/bluetooth/sleep/proto
|
||||
chown bluetooth net_bt /dev/ttyHS0
|
||||
|
|
@ -422,6 +420,9 @@ service ss_ramdump /system/bin/subsystem_ramdump
|
|||
group system
|
||||
disabled
|
||||
|
||||
on property:hw.fm.init=*
|
||||
write /sys/module/radio_iris_transport/parameters/fmsmd_set ${hw.fm.init}
|
||||
|
||||
on property:persist.sys.ssr.enable_debug=*
|
||||
write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug}
|
||||
|
||||
|
|
@ -708,13 +709,6 @@ service loc_launcher /system/bin/loc_launcher
|
|||
class late_start
|
||||
group gps inet net_raw qcom_diag net_admin wifi
|
||||
|
||||
service fm_dl /system/bin/sh /system/etc/init.qcom.fm.sh
|
||||
class late_start
|
||||
user system
|
||||
group system
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
service qcom-sh /system/bin/sh /init.qcom.sh
|
||||
class late_start
|
||||
user root
|
||||
|
|
|
|||
Loading…
Reference in a new issue