get device type instead of model name to check DA devices

Change-Id: Ib266342d512743072f4a26b42271a1d80e2da537
Signed-off-by: Sohyeon Choi <shss.choi@samsung.com>
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index c0e542c1aac3821d986a8e82c8490e34dcab4573..9e91a7133c50731d450160f34198d301adf78301 100644 (file)
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -1322,24 +1322,23 @@ typedef enum {
 } tizen_profile_t;
 
 typedef enum {
-       _MODEL_UNKNOWN = 0,
-       _MODEL_COMMON = 0x1,
-       _MODEL_FHUB = 0x2,
-       _MODEL_DA = 0x4,
-} tizen_model_t;
+       _DEV_UNKNOWN = 0,
+       _DEV_COMMON = 0x1,
+       _DEV_DA = 0x2,
+} tizen_device_t;
 
 extern tizen_profile_t _get_tizen_profile();
 extern tizen_profile_t profile;
 
-extern tizen_model_t _get_tizen_model();
-extern tizen_model_t model;
+extern tizen_device_t _get_tizen_device_type();
+extern tizen_device_t device;
 
 #define TIZEN_PROFILE_(x) (((__builtin_expect(profile != _PROFILE_UNKNOWN, 1)) ? \
                                        (profile) : _get_tizen_profile()) \
                                & (x))
 
-#define TIZEN_MODEL_(x) (((__builtin_expect(model != _MODEL_UNKNOWN, 1)) ? \
-                                       (model) : _get_tizen_model()) \
+#define TIZEN_DEVICE_TYPE_(x) (((__builtin_expect(device != _DEV_UNKNOWN, 1)) ? \
+                                       (device) : _get_tizen_device_type()) \
                                & (x))
 
 #define TIZEN_PROFILE_MOBILE   TIZEN_PROFILE_(_PROFILE_MOBILE)
@@ -1352,8 +1351,7 @@ extern tizen_model_t model;
 
 #define TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT                TIZEN_PROFILE_MOBILE
 
-#define TIZEN_FEATURE_FHUB_REFERENCE TIZEN_MODEL_(_MODEL_FHUB)
-#define TIZEN_FEATURE_DA_REFERENCE (TIZEN_MODEL_(_MODEL_FHUB) || TIZEN_MODEL_(_MODEL_DA))
+#define TIZEN_FEATURE_DA_REFERENCE TIZEN_DEVICE_TYPE_(_DEV_DA)
 
 #ifdef __cplusplus
 }

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index 671d7ce8dbf1cfcfbbf049f4f06472fc9d54e9f0..adc6bcc8928a39ba59c86068637451cfc3c57156 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -240,7 +240,7 @@ int bt_adapter_get_hci_address(char **address)
        BT_CHECK_INPUT_PARAMETER(address);
 
        if (!TIZEN_FEATURE_DA_REFERENCE) {
-               BT_INFO("Not a FHUB device");
+               BT_INFO("Not a DA device");
                return BT_ERROR_NOT_SUPPORTED;
        }
 

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 3d5fbf233866bf55ced544b3746785e6e3a1ee35..0fedc4871e6c5d719e6a7b859b3ba6c9ea6a4345 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -4976,44 +4976,36 @@ tizen_profile_t _get_tizen_profile()
 }
 
 /* LCOV_EXCL_START */
-tizen_model_t model = _MODEL_UNKNOWN;
-tizen_model_t _get_tizen_model(void)
+tizen_device_t device = _DEV_UNKNOWN;
+tizen_device_t _get_tizen_device_type(void)
 {
-       char *model_name = NULL;
+       char *device_type = NULL;
 
-       if (__builtin_expect(model != _MODEL_UNKNOWN, 1))
-               return model;
+       if (__builtin_expect(device != _DEV_UNKNOWN, 1))
+               return device;
 
-       system_info_get_platform_string("http://tizen.org/system/model_name", &model_name);
+       system_info_get_platform_string("http://tizen.org/system/device_type", &device_type);
 
-       if (model_name == NULL) {
-               model = _MODEL_COMMON;
-               return model;
+       if (device_type == NULL) {
+               device = _DEV_COMMON;
+               return device;
        }
 
-       if (!strncasecmp(model_name, "Family Hub", 10))
-               model = _MODEL_FHUB;
-       else if (!strcasecmp(model_name, "Robot Vacuum Cleaner") ||
-                       !strcasecmp(model_name, "Smart Dryer") ||
-                       !strcasecmp(model_name, "Smart Washer") ||
-                       !strcasecmp(model_name, "DDMS") ||
-                       !strcasecmp(model_name, "Smart Cooktop") ||
-                       !strcasecmp(model_name, "Smart Range") ||
-                       !strcasecmp(model_name, "Refrigerator") ||
-                       !strcasecmp(model_name, "Echo Heating System Controller") ||
-                       !strcasecmp(model_name, "Bespoke Washer") ||
-                       !strcasecmp(model_name, "Bespoke Dryer") ||
-                       !strcasecmp(model_name, "Appliance Emulator") ||
-                       !strcasecmp(model_name, "Smart Oven") ||
-                       !strcasecmp(model_name, "Smart AC") ||
-                       !strcasecmp(model_name, "AI Vision Refrigerator") ||
-                       !strncasecmp(model_name, "AI Home", 7))
-               model = _MODEL_DA;
+       if (!strcasecmp(device_type, "Robot Vacuum") ||
+                       !strcasecmp(device_type, "System A/C") ||
+                       !strcasecmp(device_type, "Washer") ||
+                       !strcasecmp(device_type, "Dryer") ||
+                       !strcasecmp(device_type, "Cooktop") ||
+                       !strcasecmp(device_type, "Range") ||
+                       !strncasecmp(device_type, "Refrigerator", 12) ||
+                       !strcasecmp(device_type, "Appliance") ||
+                       !strcasecmp(device_type, "Oven"))
+               device = _DEV_DA;
        else
-               model = _MODEL_COMMON;
+               device = _DEV_COMMON;
 
-       free(model_name);
+       free(device_type);
 
-       return model;
+       return device;
 }
 /* LCOV_EXCL_STOP */