Apply hal macro and modify script

Change-Id: Ie4a40364e7626e89167ee1ffa8b83bc81c72ffe0
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a34dcab225d967990e74876187014a487c71661..fd35d3f8d99b1f965335d307b885873264d97bd8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(bluetooth-firmware-marvell C)
 
 #INCLUDE(FindPkgConfig)
 #pkg_check_modules(package REQUIRED glib-2.0)
@@ -10,5 +11,7 @@ ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${HAL_LICENSE_DIR}/${PROJECT_NAME})
+
 ADD_SUBDIRECTORY(scripts)
 ADD_SUBDIRECTORY(src)

diff --git a/packaging/bluetooth-firmware-marvell.spec b/packaging/bluetooth-firmware-marvell.spec
index e923e321ba2c34ae51c656884485bc8ccec322cd..ffbf857fbc19348e5f5f1212ab8b7dce9531895f 100644 (file)
--- a/packaging/bluetooth-firmware-marvell.spec
+++ b/packaging/bluetooth-firmware-marvell.spec
@@ -30,7 +30,11 @@ BT script tools for artik530
 %setup -q
 
 %build
-cmake ./ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPLUGIN_INSTALL_PREFIX=%{_prefix}
+cmake ./ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DPLUGIN_INSTALL_PREFIX=%{_prefix} \
+       -DHAL_LIB_DIR=%{_hal_libdir} \
+       -DHAL_LICENSE_DIR=%{_hal_licensedir} \
+       -DHAL_SYSCONF_DIR=%{_hal_sysconfdir}
 make %{?jobs:-j%jobs}
 
 %install
@@ -44,9 +48,8 @@ rm -rf %{buildroot}
 
 %files artik530
 %manifest %{name}.manifest
-%license LICENSE
-%defattr(-,root,root,-)
-%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-end.sh
-%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-start.sh
-%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-set-addr.sh
-/hal/lib/*.so*
+%{_hal_licensedir}/%{name}/LICENSE
+%{_hal_sysconfdir}/bluetooth/bt-dev-end.sh
+%{_hal_sysconfdir}/bluetooth/bt-dev-start.sh
+%{_hal_sysconfdir}/bluetooth/bt-set-addr.sh
+%{_hal_libdir}/*.so*

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 99606f247c78af2edc7869512ff7be6e89195f97..c14438ee9962e95603546dc73870444e19b82a88 100755 (executable)
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
 # install scripts
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-dev-end.sh DESTINATION ${PLUGIN_INSTALL_PREFIX}/etc/bluetooth)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-dev-start.sh DESTINATION ${PLUGIN_INSTALL_PREFIX}/etc/bluetooth)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-set-addr.sh DESTINATION ${PLUGIN_INSTALL_PREFIX}/etc/bluetooth)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-dev-end.sh DESTINATION ${HAL_SYSCONF_DIR}/bluetooth)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-dev-start.sh DESTINATION ${HAL_SYSCONF_DIR}/bluetooth)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bt-set-addr.sh DESTINATION ${HAL_SYSCONF_DIR}/bluetooth)

diff --git a/scripts/bt-dev-end.sh b/scripts/bt-dev-end.sh
index 69aea9a2da7fc683f12af9a81eb022345538066d..d20db6b8234d5d7e816967805f9815405d5e091f 100755 (executable)
--- a/scripts/bt-dev-end.sh
+++ b/scripts/bt-dev-end.sh
@@ -7,3 +7,27 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 # Turn off Bluetooth Chip
 /usr/sbin/rfkill block bluetooth
 
+HCI_CONFIG=/usr/bin/hciconfig
+TIMEOUT=20
+for ((i=1; i<=$TIMEOUT; i++))
+do
+       /bin/sleep 0.1
+       if [ $i -eq $TIMEOUT ]
+       then
+               echo "time expired happen $i"
+               exit 2
+       fi
+       if (${HCI_CONFIG} | grep DOWN); then
+               echo "Bluetooth device is down"
+               break
+       fi
+       if (${HCI_CONFIG} | grep hci); then
+               echo "Bluetooth device still exist"
+       else
+               echo "hci is removed"
+               break
+       fi
+       echo "Continue...$i"
+done
+
+exit 0

diff --git a/scripts/bt-dev-start.sh b/scripts/bt-dev-start.sh
index b45e0ab92c11df6cd1dc20a25c1e252cbe485155..0e7900e3b9a4a95d53cfb30c855762fba30082bf 100755 (executable)
--- a/scripts/bt-dev-start.sh
+++ b/scripts/bt-dev-start.sh
@@ -28,22 +28,20 @@ echo "Power On"
 echo 2 > /sys/devices/platform/sd8x-rfkill/pwr_ctrl
 
 TIMEOUT=20
-
-for (( i=1; i<=$TIMEOUT; i++))
+for ((i=1; i<=$TIMEOUT; i++))
 do
        /bin/sleep 0.1
-
-        if [ $i -eq $TIMEOUT ]
-        then
-                echo "time expired happen $i"
-                ${RFKILL} block bluetooth
-                exit 1
-        fi
-
+       if [ $i -eq $TIMEOUT ]
+       then
+               echo "time expired happen $i"
+               ${RFKILL} block bluetooth
+               exit 2
+       fi
        if (${HCI_CONFIG} | ${GREP} hci); then
                echo "Bluetooth device is made"
                break
        fi
        echo "Continue...$i"
 done
+
 exit 0

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca1fc73f6d785a0931da618428a7141d5b194d11..964fe5203298ab96ec845bff4d5a2a3fd09f40b6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,4 +22,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-bluetooth_pkgs_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries)

diff --git a/src/hal-backend-bluetooth.c b/src/hal-backend-bluetooth.c
index 6aec23bc747e0437825c1c367db95ad24df3c412..0b1072eebf30ee9f817ec5d139c03b0a6a2a1b77 100644 (file)
--- a/src/hal-backend-bluetooth.c
+++ b/src/hal-backend-bluetooth.c
@@ -14,7 +14,7 @@
 static int bluetooth_artik_start(void)
 {
        int ret;
-       ret = system("/usr/etc/bluetooth/bt-stack-up.sh");
+       ret = system("/hal/etc/bluetooth/bt-dev-start.sh");
        if (ret == 0x100) {
                LOGE("script internal failed");
                return HAL_BACKEND_ERROR_INTERNAL;
@@ -29,7 +29,7 @@ static int bluetooth_artik_start(void)
 static int bluetooth_artik_stop(void)
 {
        int ret;
-       ret = system("/usr/etc/bluetooth/bt-stack-down.sh");
+       ret = system("/hal/etc/bluetooth/bt-dev-end.sh");
        if (ret == 0x100) {
                LOGE("script internal failed");
                return HAL_BACKEND_ERROR_INTERNAL;