da: Add DA feature newly

da feature contains many da models as well as fhub

Use da feature for below functions:
set adv data flag, offloading, log

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

diff --git a/profile.h b/profile.h
index a18a94f..2316af0 100755 (executable)
--- a/profile.h
+++ b/profile.h
@@ -56,6 +56,7 @@ typedef enum {
        TIZEN_MODEL_RPI3 = 0x40,
        TIZEN_MODEL_ROBOT = 0x80,
        TIZEN_MODEL_FHUB = 0x100,
+       TIZEN_MODEL_DA = 0x200,
 } tizen_model_t;
 
 typedef enum {
@@ -218,6 +219,11 @@ static inline tizen_model_t _get_tizen_model(void)
                model = TIZEN_MODEL_ROBOT;
        else if (!strncasecmp(model_name, "Family Hub", 10))
                model = TIZEN_MODEL_FHUB;
+       else if (!strcasecmp(model_name, "Robot Vacuum Cleaner") ||
+                       !strcasecmp(model_name, "Smart Dryer") ||
+                       !strcasecmp(model_name, "Smart Washer") ||
+                       !strcasecmp(model_name, "DDMS"))
+               model = TIZEN_MODEL_DA;
        else
                model = TIZEN_MODEL_COMMON;
 
@@ -254,6 +260,7 @@ static inline tizen_certifcation_mode_t _get_tizen_certification_mode(void)
 #define TIZEN_FEATURE_BLUEZ_SPEAKER_REFERENCE ((_get_tizen_model()) == TIZEN_MODEL_RPI3 && (_get_tizen_profile()) == TIZEN_PROFILE_COMMON)
 #define TIZEN_FEATURE_ROBOT_REFERENCE ((_get_tizen_model()) == TIZEN_MODEL_ROBOT)
 #define TIZEN_FEATURE_BLUEZ_FHUB ((_get_tizen_model()) == TIZEN_MODEL_FHUB)
+#define TIZEN_FEATURE_BLUEZ_DA ((_get_tizen_model()) == TIZEN_MODEL_FHUB || (_get_tizen_model()) == TIZEN_MODEL_DA)
 #define TIZEN_FEATURE_BLUEZ_STACK_CERTIFICATION (((_get_tizen_certification_mode()) & TIZEN_CERTI_MODE_STACK) != 0)
 #define TIZEN_FEATURE_BLUEZ_PROFILE_CERTIFICATION (((_get_tizen_certification_mode()) & TIZEN_CERTI_MODE_PROFILE) != 0)
 

diff --git a/src/adapter.c b/src/adapter.c
index 1884fcf..b047e63 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -4297,7 +4297,7 @@ static int set_adv_data_flag(uint8_t *adv_data, uint8_t *data, int data_len, voi
                                EIR_SIM_HOST | EIR_BREDR_UNSUP;
        else {
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-               if (TIZEN_FEATURE_BLUEZ_FHUB) {
+               if (TIZEN_FEATURE_BLUEZ_DA) {
                        DBG("Disable LE General Discoverable Mode");
                        adv_data[2] = EIR_CONTROLLER | EIR_SIM_HOST;
                } else
@@ -10469,7 +10469,7 @@ static void adapter_start(struct btd_adapter *adapter)
        adapter_get_adv_tx_power(adapter);
 
        /* By default enable offloading for testing, this should be modified */
-       if (!TIZEN_FEATURE_BLUEZ_FHUB)
+       if (!TIZEN_FEATURE_BLUEZ_DA)
                if (adapter_le_is_supported_offloading())
                        adapter_le_enable_offloading(TRUE);
 #endif

diff --git a/src/log.h b/src/log.h
index 058b9a8..2db40d9 100755 (executable)
--- a/src/log.h
+++ b/src/log.h
@@ -74,7 +74,7 @@ void log_cleanup(void);
 
 #define DBG(fmt, arg...) \
        do { \
-               if (TIZEN_FEATURE_BLUEZ_FHUB && BT_BLUEZ_DEBUG_FILE) { \
+               if (TIZEN_FEATURE_BLUEZ_DA && BT_BLUEZ_DEBUG_FILE) { \
                        bt_bluez_log("[%s:%d] "fmt"\n", __func__, __LINE__, ## arg); \
                } \
                DBG_IDX(0xffff, fmt, ## arg); \
@@ -82,7 +82,7 @@ void log_cleanup(void);
 
 #define error(fmt, arg...) \
        do { \
-               if (TIZEN_FEATURE_BLUEZ_FHUB && BT_BLUEZ_DEBUG_FILE) { \
+               if (TIZEN_FEATURE_BLUEZ_DA && BT_BLUEZ_DEBUG_FILE) { \
                        bt_bluez_log("[%s:%d] "fmt"\n", __func__, __LINE__, ## arg); \
                } \
                btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg); \
@@ -90,7 +90,7 @@ void log_cleanup(void);
 
 #define warn(fmt, arg...) \
        do { \
-               if (TIZEN_FEATURE_BLUEZ_FHUB && BT_BLUEZ_DEBUG_FILE) { \
+               if (TIZEN_FEATURE_BLUEZ_DA && BT_BLUEZ_DEBUG_FILE) { \
                        bt_bluez_log("[%s:%d] "fmt"\n", __func__, __LINE__, ## arg); \
                } \
                btd_warn(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg); \

diff --git a/src/main.c b/src/main.c
index 57af6db..eee773b 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -1309,7 +1309,7 @@ int main(int argc, char *argv[])
        __btd_log_cleanup();
 
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-       if (TIZEN_FEATURE_BLUEZ_FHUB)
+       if (TIZEN_FEATURE_BLUEZ_DA)
                log_cleanup();
 #endif