mako: bluetooth: bring up with bluedroid stack
- remove some codes not to be used with bluedroid stack
- add a property to check initialization status of bluetooth
- remove the code to initialize hci_smd driver
Change-Id: I73aa66421ed42bf464f8901b1e0346a9c657c832
Signed-off-by: Iliyan Malchev <malchev@google.com>
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 28a95bc..e7c25d0 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -33,7 +33,10 @@
BOARD_USES_ALSA_AUDIO:= true
BOARD_USES_FLUENCE_INCALL := true
BOARD_USES_SEPERATED_AUDIO_INPUT := true
+
BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_QCOM := true
+BLUETOOTH_HCI_USE_MCT := true
TARGET_NO_RADIOIMAGE := true
TARGET_BOARD_PLATFORM := msm8960
@@ -80,9 +83,6 @@
BOARD_USES_SECURE_SERVICES := true
-BOARD_BLUETOOTH_DOES_NOT_USE_RFKILL := true
-BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY := true
-
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
TARGET_NO_RPC := true
diff --git a/init.mako.bt.sh b/init.mako.bt.sh
index 1d932e1..0111434 100644
--- a/init.mako.bt.sh
+++ b/init.mako.bt.sh
@@ -32,6 +32,8 @@
#load bd addr
BDADDR=`/system/bin/bdAddrLoader -p`
+setprop bluetooth.status off
+
logi "BDADDR: $BDADDR"
case $POWER_CLASS in
@@ -56,11 +58,12 @@
case $? 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
-logi "start bluetooth smd transport"
+setprop bluetooth.status on
-echo 1 > /sys/module/hci_smd/parameters/hcismd_set
+logi "start bluetooth smd transport"
exit 0
diff --git a/init.mako.rc b/init.mako.rc
index 6b21ee8..7c7a18a 100644
--- a/init.mako.rc
+++ b/init.mako.rc
@@ -257,7 +257,7 @@
start hciattach
on property:bluetooth.hciattach=false
- write /sys/module/hci_smd/parameters/hcismd_set 0
+ setprop bluetooth.status off
service bridgemgrd /system/bin/bridgemgrd
class main