Modify RPI3 firmware download script

Change-Id: I0d49eefec9181325e25c78a4ad4ce0c36d89e046
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
index b7502f2..6965938 100755 (executable)
--- a/firmware/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
@@ -13,4 +13,4 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bcm4343w/BCM4343A1_001.002.009.0022.00
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bcm43012/BCM43012B0_002.001.021.0081.0087.hex DESTINATION /lib/firmware/bcm43012/)
 
 # RPI3
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rpi3/BCM43430A1.hcd DESTINATION ${PLUGIN_INSTALL_PREFIX}/etc/bluetooth)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rpi3/BCM43430A1.hcd DESTINATION /lib/firmware/brcm)

diff --git a/packaging/bluetooth-firmware-bcm.spec b/packaging/bluetooth-firmware-bcm.spec
index d7b1445..d6d8a7a 100644 (file)
--- a/packaging/bluetooth-firmware-bcm.spec
+++ b/packaging/bluetooth-firmware-bcm.spec
@@ -148,7 +148,7 @@ ln -s %{_prefix}/etc/bluetooth/bt-dev-end-rpi3.sh %{_prefix}/etc/bluetooth/bt-de
 %manifest %{name}.manifest
 %license LICENSE.APLv2 LICENSE.Broadcom
 %defattr(-,root,root,-)
-%{_prefix}/etc/bluetooth/BCM43430A1.hcd
+/lib/firmware/brcm/BCM43430A1.hcd
 %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-end-rpi3.sh
 %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-start-rpi3.sh
 %manifest %{name}.manifest

diff --git a/scripts/bt-dev-start-rpi3.sh b/scripts/bt-dev-start-rpi3.sh
index 0d32e8c..dc2f600 100644 (file)
--- a/scripts/bt-dev-start-rpi3.sh
+++ b/scripts/bt-dev-start-rpi3.sh
@@ -3,14 +3,14 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 # Script for registering Broadcom UART BT device
 BT_UART_DEVICE=/dev/ttyAMA0
-BT_CHIP_TYPE=bcm43xx
+BT_CHIP_TYPE=bcm
 BT_MAC_FILE=/opt/etc/.bd_addr
 
 BT_PLATFORM_DEFAULT_HCI_NAME="TIZEN-Mobile"
-UART_SPEED=921600
+UART_SPEED=3000000
 
 HCI_CONFIG=/usr/bin/hciconfig
-HCI_ATTACH=/usr/bin/hciattach
+BT_ATTACH=/usr/bin/btattach
 
 if [ ! -e "$BT_UART_DEVICE" ]
 then
@@ -50,22 +50,11 @@ else
        echo "Registering Bluetooth device"
 
        # Attaching Broadcom device
-       flag=0
-       for ((i=0; i<2; i++))
-       do
-               if ($HCI_ATTACH $BT_UART_DEVICE $BT_CHIP_TYPE $UART_SPEED noflow nosleep $BT_MAC -t 5); then
-                       sleep 0.1
-                       $HCI_CONFIG hci0 up
-                       $HCI_CONFIG hci0 name $BT_PLATFORM_DEFAULT_HCI_NAME
-                       $HCI_CONFIG hci0 sspmode 1
-                       echo "HCIATTACH success"
-                       flag=1
-                       break
-               fi
-       done
+       $BT_ATTACH -B $BT_UART_DEVICE -P $BT_CHIP_TYPE -S $UART_SPEED > /dev/null 2>&1 &
 
-       if [ $flag -eq 0 ]
-       then
-               echo "HCIATTACH failed"
-       fi
+       sleep 0.02
+
+       $HCI_CONFIG hci0 up
+       $HCI_CONFIG hci0 name $BT_PLATFORM_DEFAULT_HCI_NAME
+       echo "HCIATTACH success"
 fi