Dongle feature enable in ivi profile

Change-Id: Iad9307603f22bba862f2159e3d3fcaf7b8ca5c35

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c22cb9c..fc93e48 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,10 @@ IF (TIZEN_PROFILE_TV)
        ADD_DEFINITIONS ("-DTIZEN_PROFILE_TV")
 ENDIF (TIZEN_PROFILE_TV)
 
+IF (TIZEN_PROFILE_IVI)
+       ADD_DEFINITIONS ("-DTIZEN_PROFILE_IVI")
+ENDIF (TIZEN_PROFILE_IVI)
+
 MESSAGE(${CMAKE_C_FLAGS})
 MESSAGE(${pkgs_LDFLAGS})
 
@@ -57,8 +61,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl")
 # install
 INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME telephony-daemon)
-IF (NOT TIZEN_PROFILE_TV)
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon.service DESTINATION ${UNITDIR})
-ELSE (NOT TIZEN_PROFILE_TV)
+IF (TIZEN_PROFILE_TV OR TIZEN_PROFILE_IVI)
        INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon-on-demand.service DESTINATION ${UNITDIR} RENAME telephony-daemon.service)
-ENDIF (NOT TIZEN_PROFILE_TV)
+ELSE (TIZEN_PROFILE_TV OR TIZEN_PROFILE_IVI)
+       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon.service DESTINATION ${UNITDIR})
+ENDIF (TIZEN_PROFILE_TV OR TIZEN_PROFILE_IVI)

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 7cfbc9c..b3662f4 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -28,16 +28,19 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DUNIT_INSTALL_DIR=%{_unitdir} \
        -DVERSION=%{version} \
        -DTIZEN_DEBUG_ENABLE=1 \
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{profile}" == "tv"
        -DTIZEN_PROFILE_TV=1 \
 %endif
+%if "%{profile}" == "ivi"
+       -DTIZEN_PROFILE_IVI=1 \
+%endif
 
 make %{?_smp_mflags}
 
 %install
 
 %make_install
-%if "%{?tizen_profile_name}" != "tv"
+%if "%{profile}" != "tv" && "%{profile}" != "ivi"
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 ln -s %{_unitdir}/telephony-daemon.service %{buildroot}%{_unitdir}/multi-user.target.wants/telephony-daemon.service
 %endif
@@ -49,7 +52,7 @@ ln -s %{_unitdir}/telephony-daemon.service %{buildroot}%{_unitdir}/multi-user.ta
 %defattr(644,root,root,-)
 %caps(cap_dac_override,cap_net_admin=eip) %attr(755,root,root) %{_bindir}/telephony-daemon
 %{_unitdir}/telephony-daemon.service
-%if "%{?tizen_profile_name}" != "tv"
+%if "%{profile}" != "tv" && "%{profile}" != "ivi"
 %{_unitdir}/multi-user.target.wants/telephony-daemon.service
 %endif
 %{_datadir}/license/telephony-daemon

diff --git a/src/main.c b/src/main.c
index b0379f9..2e818a2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -141,6 +141,12 @@ static void telephony_signal_handler(int signo)
                tcore_server_exit(_server);
        } break;
 
+#if defined(TIZEN_PROFILE_TV) || defined(TIZEN_PROFILE_IVI)
+       case SIGHUP: {
+               warn("*~*~*~* Ignore Signal: [SIGHUP] *~*~*~*");
+       } break;
+#endif
+
        default: {
                warn("*~*~*~* Unhandled Signal: [%d] *~*~*~*", signo);
        } break;
@@ -148,9 +154,7 @@ static void telephony_signal_handler(int signo)
 
        return;
 }
-#endif
-
-#if defined(TIZEN_PROFILE_TV) && !defined(TIZEN_DEBUG_ENABLE)
+#elif defined(TIZEN_PROFILE_TV) || defined(TIZEN_PROFILE_IVI)
 static void telephony_signal_handler(int signo)
 {
        if (!_server)
@@ -317,7 +321,7 @@ static gboolean load_plugins(Server *s, const char *path, gboolean flag_test_loa
 
 int main(int argc, char *argv[])
 {
-#if defined(TIZEN_DEBUG_ENABLE) || defined(TIZEN_PROFILE_TV)
+#if defined(TIZEN_DEBUG_ENABLE) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_PROFILE_IVI)
        struct sigaction sigact;
 #endif
        Server *s = NULL;
@@ -362,14 +366,12 @@ int main(int argc, char *argv[])
                warn("sigaction(SIGTERM) failed.");
        if (sigaction(SIGUSR1, &sigact, NULL) < 0)
                warn("sigaction(SIGUSR1) failed.");
-#ifdef TIZEN_PROFILE_TV
+#if defined(TIZEN_PROFILE_TV) || defined(TIZEN_PROFILE_IVI)
        /* SIGHUP should be ignored because cellular dongle ejection makes this signal */
        if (sigaction(SIGHUP, &sigact, NULL) < 0)
                warn("sigaction(SIGHUP) failed.");
 #endif
-#endif
-
-#if defined(TIZEN_PROFILE_TV) && !defined(TIZEN_DEBUG_ENABLE)
+#elif defined(TIZEN_PROFILE_TV) || defined(TIZEN_PROFILE_IVI)
        /* Signal Registration */
        sigact.sa_handler = telephony_signal_handler;
        sigemptyset(&sigact.sa_mask);