Support the RPI3 target for TV profile

We should support both RPI3 and XU3 target on TV
profile. For this, modify the logic to enable BT

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

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index 47bd80b..10ea862 100644 (file)
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -267,6 +267,11 @@ int _bt_enable_adapter(void)
 
        __bt_core_set_status(BT_ACTIVATING);
        if (TIZEN_FEATURE_BT_USB_DONGLE) {
+               /* activate Bluez */
+               ret = __bt_call_systemact_service(BT_SYSTEMACT_BLUEZ_START);
+               if (ret < 0)
+                       BT_ERR("If bluez already exist, skip this error");
+
                ret = __bt_call_systemact_service(BT_SYSTEMACT_HCI_UP);
                if (ret < 0)
                        BT_ERR("Failed to call systemact service");

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
index 3e5c632..0f7823d 100644 (file)
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
@@ -1563,6 +1563,8 @@ static gboolean __bt_adapter_post_set_disabled(gpointer user_data)
                        __bt_set_flightmode_request(BT_ADAPTER_FLIGHT_MODE_NONE);
                } else
                        _bt_reliable_terminate_service(NULL);
+       } else {
+               _bt_set_disabled(BLUETOOTH_ERROR_NONE);
        }
 
        return FALSE;

diff --git a/include/bt-internal-types.h b/include/bt-internal-types.h
index 24f2bdf..d61d10c 100644 (file)
--- a/include/bt-internal-types.h
+++ b/include/bt-internal-types.h
@@ -853,7 +853,7 @@ static inline bool get_tizen_feature_supported(char *feature)
 #define TIZEN_FEATURE_NETWORK_TETHERING_ENABLE (get_tizen_profile() & (_PROFILE_MOBILE))
 #define TIZEN_FEATURE_TELEPHONY_ENABLED (get_tizen_profile() & (_PROFILE_MOBILE))
 #define TIZEN_FEATURE_FLIGHTMODE_ENABLED (get_tizen_profile() & (_PROFILE_MOBILE | _PROFILE_WEARABLE))
-#define TIZEN_FEATURE_BT_USB_DONGLE (get_tizen_profile() & (_PROFILE_TV))
+#define TIZEN_FEATURE_BT_USB_DONGLE ((get_tizen_model()) == _MODEL_COMMON && (get_tizen_profile()) == _PROFILE_TV)
 #define TIZEN_FEATURE_BLUEZ_SPEAKER_REFERENCE ((get_tizen_model()) == _MODEL_RPI3 && (get_tizen_profile()) == _PROFILE_COMMON)
 #define TIZEN_FEATURE_BT_SUPPORTED (get_tizen_feature_supported(BT_FEATURE_COMMON) == true)