msm8976-common: Cleanup bt
* We don't need hci_qcomm_init and init.qcom.bt.sh * Remove hci_filter_root * Update sysfs permissions from bullhead Change-Id: Id0b80f188cc3dd6d3595f5216bb3b927179afced
This commit is contained in:
Luca Stefani
parent
f91fd4cfea
commit
e601781cca
|
|
@ -199,8 +199,6 @@ PRODUCT_PACKAGES += \
|
|||
# Ramdisk
|
||||
PRODUCT_PACKAGES += \
|
||||
fstab.qcom \
|
||||
init.qcom.sh \
|
||||
init.qcom.bt.sh
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
init.qcom.rc \
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ vendor/lib/soundfx/libqcreverb.so
|
|||
vendor/lib/soundfx/libqcvirt.so
|
||||
|
||||
# Bluetooth
|
||||
bin/hci_qcomm_init
|
||||
bin/wcnss_filter
|
||||
etc/firmware/btfw32.tlv
|
||||
etc/firmware/btnv32.bin
|
||||
|
|
|
|||
|
|
@ -41,12 +41,3 @@ LOCAL_MODULE_CLASS := ETC
|
|||
LOCAL_SRC_FILES := etc/ueventd.qcom.rc
|
||||
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
# Configuration scripts
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := init.qcom.bt.sh
|
||||
LOCAL_MODULE_TAGS := optional eng
|
||||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_SRC_FILES := etc/init.qcom.bt.sh
|
||||
include $(BUILD_PREBUILT)
|
||||
|
|
|
|||
|
|
@ -1,91 +0,0 @@
|
|||
#!/system/bin/sh
|
||||
# Copyright (c) 2009-2016, 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.
|
||||
#
|
||||
|
||||
LOG_TAG="qcom-bluetooth"
|
||||
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
|
||||
}
|
||||
|
||||
# BR/EDR & LE power class configurations
|
||||
POWER_CLASS=`getprop qcom.bt.dev_power_class`
|
||||
LE_POWER_CLASS=`getprop qcom.bt.le_dev_pwr_class`
|
||||
|
||||
setprop bluetooth.status off
|
||||
|
||||
case $POWER_CLASS in
|
||||
1) PWR_CLASS="-p 0" ;
|
||||
logi "Power Class: 1";;
|
||||
2) PWR_CLASS="-p 1" ;
|
||||
logi "Power Class: 2";;
|
||||
3) PWR_CLASS="-p 2" ;
|
||||
logi "Power Class: CUSTOM";;
|
||||
*) PWR_CLASS="";
|
||||
logi "Power Class: Ignored. Default(1) used (1-CLASS1/2-CLASS2/3-CUSTOM)";
|
||||
logi "Power Class: To override, Before turning BT ON; setprop qcom.bt.dev_power_class <1 or 2 or 3>";;
|
||||
esac
|
||||
|
||||
case $LE_POWER_CLASS in
|
||||
1) LE_PWR_CLASS="-P 0" ;
|
||||
logi "LE Power Class: 1";;
|
||||
2) LE_PWR_CLASS="-P 1" ;
|
||||
logi "LE Power Class: 2";;
|
||||
3) LE_PWR_CLASS="-P 2" ;
|
||||
logi "LE Power Class: CUSTOM";;
|
||||
*) LE_PWR_CLASS="-P 1";
|
||||
logi "LE Power Class: Ignored. Default(2) used (1-CLASS1/2-CLASS2/3-CUSTOM)";
|
||||
logi "LE Power Class: To override, Before turning BT ON; setprop qcom.bt.le_dev_pwr_class <1 or 2 or 3>";;
|
||||
esac
|
||||
|
||||
eval $(/system/bin/hci_qcomm_init -e $PWR_CLASS $LE_PWR_CLASS && echo "exit_code_hci_qcomm_init=0" || echo "exit_code_hci_qcomm_init=1")
|
||||
|
||||
case $exit_code_hci_qcomm_init in
|
||||
0) logi "Bluetooth QSoC firmware download succeeded, $BTS_DEVICE $BTS_TYPE $BTS_BAUD $BTS_ADDRESS";;
|
||||
*) failed "Bluetooth QSoC firmware download failed" $exit_code_hci_qcomm_init;
|
||||
|
||||
setprop bluetooth.status off
|
||||
|
||||
exit $exit_code_hci_qcomm_init;;
|
||||
esac
|
||||
|
||||
setprop bluetooth.status on
|
||||
|
||||
exit 0
|
||||
|
|
@ -96,32 +96,13 @@ on fs
|
|||
rm -rf /efs/dmverity
|
||||
|
||||
on boot
|
||||
chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power
|
||||
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type
|
||||
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state
|
||||
chown bluetooth bluetooth /proc/bluetooth/sleep/proto
|
||||
chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_lpm
|
||||
chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_btwrite
|
||||
chown system system /sys/module/sco/parameters/disable_esco
|
||||
chown system system /sys/class/leds/red/blink
|
||||
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
|
||||
# Bluetooth
|
||||
chown bluetooth net_bt /sys/class/rfkill/rfkill0/type
|
||||
chown bluetooth net_bt /sys/class/rfkill/rfkill0/state
|
||||
chmod 0660 /sys/class/rfkill/rfkill0/state
|
||||
chmod 0660 /proc/bluetooth/sleep/proto
|
||||
chown bluetooth bluetooth /dev/ttyHS0
|
||||
chmod 0660 /sys/module/hci_uart/parameters/ath_lpm
|
||||
chmod 0660 /sys/module/hci_uart/parameters/ath_btwrite
|
||||
chown bluetooth net_bt /dev/ttyHS0
|
||||
chmod 0660 /dev/ttyHS0
|
||||
chown bluetooth bluetooth /sys/devices/platform/msm_serial_hs.0/clock
|
||||
chmod 0660 /sys/devices/platform/msm_serial_hs.0/clock
|
||||
|
||||
chmod 0660 /dev/ttyHS2
|
||||
chown bluetooth bluetooth /dev/ttyHS2
|
||||
|
||||
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/device/extldo
|
||||
chown bluetooth net_bt /sys/class/rfkill/rfkill0/device/extldo
|
||||
chmod 0660 /sys/class/rfkill/rfkill0/device/extldo
|
||||
|
||||
# rmt_storage
|
||||
|
|
@ -1512,32 +1493,6 @@ service start_hci_filter /system/bin/wcnss_filter
|
|||
group bluetooth qcom_diag
|
||||
disabled
|
||||
|
||||
on property:wc_transport.start_root=true
|
||||
start hci_filter_root
|
||||
|
||||
on property:wc_transport.start_root=false
|
||||
stop hci_filter_root
|
||||
|
||||
service hci_filter_root /system/bin/wcnss_filter
|
||||
class late_start
|
||||
user bluetooth
|
||||
group bluetooth qcom_diag system
|
||||
disabled
|
||||
|
||||
service hciattach /system/bin/sh /system/etc/init.qcom.bt.sh
|
||||
class late_start
|
||||
user bluetooth
|
||||
group bluetooth net_bt_admin
|
||||
disabled
|
||||
seclabel u:r:bluetooth_loader:s0
|
||||
oneshot
|
||||
|
||||
on property:bluetooth.hciattach=true
|
||||
start hciattach
|
||||
|
||||
on property:bluetooth.hciattach=false
|
||||
setprop bluetooth.status off
|
||||
|
||||
# FM
|
||||
on property:hw.fm.init=0
|
||||
write /sys/module/radio_iris_transport/parameters/fmsmd_set 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue