X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-common.c;h=bbfe207e64025e115bf0bb9e7834173ff1f71a04;hb=604fbd7fc8b48cc594017fb6d8b77c378f3e0cca;hp=dd57edac3a4bc3b35ef3df05a448babe7ee63947;hpb=ec6385bc6e11d8a29984e6e26d908d0de2670cc0;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-service/bt-service-common.c b/bt-service/bt-service-common.c
index dd57eda..bbfe207 100644
--- a/bt-service/bt-service-common.c
+++ b/bt-service/bt-service-common.c
@@ -697,7 +697,7 @@ char *_bt_get_profile_uuid128(bt_profile_type_t profile_type)
 
 const char *_bt_convert_uuid_to_string(const char *uuid)
 {
-#define SHORT_UUID_COUNT	162
+#define SHORT_UUID_COUNT	199
 #define LONG_UUID_COUNT		17
 
 	if (!uuid)
@@ -801,6 +801,17 @@ const char *_bt_convert_uuid_to_string(const char *uuid)
 		{"181D", "Weight Scale"},
 		{"181E", "Bond Management"},
 		{"181F", "Continuous Glucose Monitoring"},
+		{"1820", "Internet Protocol Support Service"},
+		{"1821", "Indoor Positioning"},
+		{"1822", "Pulse Oximeter Service"},
+		{"1823", "HTTP Proxy"},
+		{"1824", "Transport Discovery"},
+		{"1825", "Object Transfer Service"},
+		{"1826", "Fitness Machine"},
+		{"1827", "Mesh Provisioning Service"},
+		{"1828", "Mesh Proxy Service"},
+		{"1829", "Reconnection Configuration"},
+		{"183A", "Insulin Delivery"},
 
 		/* GATT Declarations */
 		{"2800", "Primary Service Declaration"},
@@ -882,6 +893,32 @@ const char *_bt_convert_uuid_to_string(const char *uuid)
 		{"2A68", "Navigation"},
 		{"2A6D", "Pressure"},
 		{"2A6E", "Temperature"},
+		{"2A8E", "Height"},
+		{"2A90", "Last Name"},
+		{"2A91", "Maximum Recommended Heart Rate"},
+		{"2A92", "Resting Heart Rate"},
+		{"2A98", "Weight"},
+		{"2A9B", "Body Composition Feature"},
+		{"2A9C", "Body Composition Measurement"},
+		{"2A9D", "Weight Measurement"},
+		{"2AA2", "Language"},
+		{"2AA4", "Bond Management Control Point"},
+		{"2AA5", "Bond Management Features"},
+		{"2AA6", "Central Address Resolution"},
+		{"2AAD", "Indoor Positioning Configuration"},
+		{"2AB5", "Location Name"},
+		{"2AB6", "URI"},
+		{"2ABC", "TDS Control Point"},
+		{"2AC9", "Resolvable Private Address Only"},
+		{"2ACC", "Fitness Machine Feature"},
+		{"2ACE", "Cross Trainer Data"},
+		{"2AD3", "Training Status"},
+		{"2AD7", "Supported Heart Rate Range"},
+		{"2AD9", "Fitness Machine Control Point"},
+		{"2ADA", "Fitness Machine Status"},
+		{"2B1D", "RC Feature"},
+		{"2B1E", "RC Settings"},
+		{"2B1F", "Reconnection Configuration Control Point"},
 	};
 	static uuid_name_s long_uuid_name[LONG_UUID_COUNT] = {
 		// List should be sorted by UUID
@@ -934,7 +971,6 @@ const char *_bt_convert_uuid_to_string(const char *uuid)
 			start = p + 1;
 	}
 
-	BT_INFO("Unknown uuid : %s", uuid);
 	return unknown_name;
 }
 
@@ -1122,6 +1158,7 @@ const char *_bt_convert_service_function_to_string(int function)
 		{BT_GET_ADVERTISING_DATA, "BT_GET_ADVERTISING_DATA"},
 		{BT_SET_ADVERTISING_DATA, "BT_SET_ADVERTISING_DATA"},
 		{BT_SET_SCAN_PARAMETERS, "BT_SET_SCAN_PARAMETERS"},
+		{BT_SET_SCAN_TYPE, "BT_SET_SCAN_TYPE"},
 		{BT_GET_SCAN_RESPONSE_DATA, "BT_GET_SCAN_RESPONSE_DATA"},
 		{BT_SET_SCAN_RESPONSE_DATA, "BT_SET_SCAN_RESPONSE_DATA"},
 		{BT_IS_ADVERTISING, "BT_IS_ADVERTISING"},
@@ -1135,8 +1172,6 @@ const char *_bt_convert_service_function_to_string(int function)
 		{BT_REMOVE_WHITE_LIST, "BT_REMOVE_WHITE_LIST"},
 		{BT_CLEAR_WHITE_LIST, "BT_CLEAR_WHITE_LIST"},
 		{BT_REGISTER_SCAN_FILTER, "BT_REGISTER_SCAN_FILTER"},
-		{BT_UNREGISTER_SCAN_FILTER, "BT_UNREGISTER_SCAN_FILTER"},
-		{BT_UNREGISTER_ALL_SCAN_FILTERS, "BT_UNREGISTER_ALL_SCAN_FILTERS"},
 		{BT_IS_SCAN_FILTER_SUPPORTED, "BT_IS_SCAN_FILTER_SUPPORTED"},
 		{BT_GET_PROFILE_CONNECTED_DEVICES, "BT_GET_PROFILE_CONNECTED_DEVICES"},
 		{BT_ENABLE_FORCE_HCI_DUMP, "BT_ENABLE_FORCE_HCI_DUMP"},
@@ -1194,6 +1229,8 @@ const char *_bt_convert_service_function_to_string(int function)
 		{BT_OOB_READ_LOCAL_DATA, "BT_OOB_READ_LOCAL_DATA"},
 		{BT_OOB_ADD_REMOTE_DATA, "BT_OOB_ADD_REMOTE_DATA"},
 		{BT_OOB_REMOVE_REMOTE_DATA, "BT_OOB_REMOVE_REMOTE_DATA"},
+		{BT_LE_OOB_READ_LOCAL_DATA, "BT_LE_OOB_READ_LOCAL_DATA"},
+		{BT_LE_OOB_ADD_REMOTE_DATA, "BT_LE_OOB_ADD_REMOTE_DATA"},
 		{BT_AVRCP_SET_TRACK_INFO, "BT_AVRCP_SET_TRACK_INFO"},
 		{BT_AVRCP_SET_PROPERTY, "BT_AVRCP_SET_PROPERTY"},
 		{BT_AVRCP_SET_PROPERTIES, "BT_AVRCP_SET_PROPERTIES"},
@@ -1474,6 +1511,8 @@ void __bt_get_auth_info(GVariant *reply, char *auth_info)
 				g_variant_get(tmp_value, "ay", &value_iter);
 				while (g_variant_iter_loop(value_iter, "y", &m_value))
 					manufacturer_data[i++] = m_value;
+
+				g_variant_iter_free(value_iter);
 			}
 			g_variant_unref(tmp_value);
 		} else {