X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-event-sender.c;h=4dc469194ac94d2b7d378b000bd3483b6fcd5bfc;hb=39ba85ec55b2de81bb872bacb035f6731e56086e;hp=8ba8847818183a9574663bf087379689f2daaed6;hpb=123df36aa056cc20a1de3d7982c5b0e55aa89578;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-service/bt-service-event-sender.c b/bt-service/bt-service-event-sender.c
index 8ba8847..4dc4691 100644
--- a/bt-service/bt-service-event-sender.c
+++ b/bt-service/bt-service-event-sender.c
@@ -27,7 +27,7 @@
 static GDBusConnection *event_conn;
 static GDBusConnection *hf_local_term_event_conn;
 
-#ifdef TIZEN_FEATURE_BT_HPS
+#ifdef HPS_FEATURE
 int _bt_send_to_hps(void)
 {
 	gboolean ret = FALSE;
@@ -100,9 +100,6 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BT_OPP_SERVER_EVENT:
 		path = BT_OPP_SERVER_PATH;
 		break;
-	case BT_MAP_CLIENT_EVENT:
-		path = BT_MAP_CLIENT_PATH;
-		break;
 	case BT_PBAP_CLIENT_EVENT:
 		path = BT_PBAP_CLIENT_PATH;
 		break;
@@ -115,9 +112,6 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BT_A2DP_SOURCE_EVENT:
 		path = BT_A2DP_SOURCE_PATH;
 		break;
-	case BT_OTP_EVENT:
-		path = BT_OTP_PATH;
-		break;
 	default:
 		BT_ERR("Unknown event");
 		return BLUETOOTH_ERROR_INTERNAL;
@@ -224,27 +218,27 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 		break;
 	case BLUETOOTH_HID_CONNECTED:
 		signal = BT_INPUT_CONNECTED;
-		BT_INFO_C("Connected [HID]");
+		BT_INFO_C("### Connected [HID]");
 		break;
 	case BLUETOOTH_HID_DISCONNECTED:
 		signal = BT_INPUT_DISCONNECTED;
-		BT_INFO_C("Disconnected [HID]");
+		BT_INFO_C("### Disconnected [HID]");
 		break;
 	case BLUETOOTH_HID_DEVICE_CONNECTED:
 		signal = BT_INPUT_HID_DEVICE_CONNECTED;
-		BT_INFO_C("Connected [HIDDevice]");
+		BT_INFO_C("### Connected [HID Device]");
 		break;
 	case BLUETOOTH_HID_DEVICE_DISCONNECTED:
 		signal = BT_INPUT_HID_DEVICE_DISCONNECTED;
-		BT_INFO_C("Disconnected [HIDDevice]");
+		BT_INFO_C("### Disconnected [HID Device]");
 		break;
 	case BLUETOOTH_PBAP_CONNECTED:
 		signal = BT_PBAP_CONNECTED;
-		BT_INFO_C("Connected [PBAP Client]");
+		BT_INFO_C("### Connected [PBAP Client]");
 		break;
 	case BLUETOOTH_PBAP_DISCONNECTED:
 		signal = BT_PBAP_DISCONNECTED;
-		BT_INFO_C("Disconnected [PBAP Client]");
+		BT_INFO_C("### Disconnected [PBAP Client]");
 		break;
 	case BLUETOOTH_PBAP_PHONEBOOK_SIZE:
 		signal = BT_PBAP_PHONEBOOK_SIZE;
@@ -271,19 +265,19 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 		break;
 	case BLUETOOTH_EVENT_AV_CONNECTED:
 		signal = BT_STEREO_HEADSET_CONNECTED;
-		BT_INFO_C("Connected [A2DP]");
+		BT_INFO_C("### Connected [A2DP]");
 		break;
 	case BLUETOOTH_EVENT_AV_DISCONNECTED:
 		signal = BT_STEREO_HEADSET_DISCONNECTED;
-		BT_INFO_C("Disconnected [A2DP]");
+		BT_INFO_C("### Disconnected [A2DP]");
 		break;
 	case BLUETOOTH_EVENT_AV_SOURCE_CONNECTED:
 		signal = BT_A2DP_SOURCE_CONNECTED;
-		BT_INFO_C("Connected [A2DP Source]");
+		BT_INFO_C("### Connected [A2DP Source]");
 		break;
 	case BLUETOOTH_EVENT_AV_SOURCE_DISCONNECTED:
 		signal = BT_A2DP_SOURCE_DISCONNECTED;
-		BT_INFO_C("Disconnected [A2DP Source]");
+		BT_INFO_C("### Disconnected [A2DP Source]");
 		break;
 	case BLUETOOTH_EVENT_AG_AUDIO_CONNECTED:
 		signal = BT_SCO_CONNECTED;
@@ -323,34 +317,6 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 		signal = BT_OPP_DISCONNECTED;
 		BT_INFO_C("Disconnected [OPP]");
 		break;
-	case BLUETOOTH_EVENT_MAP_CONNECTED:
-		signal = BT_MAP_CONNECTED;
-		BT_INFO_C("Connected [MAP]");
-		break;
-	case BLUETOOTH_EVENT_MAP_DISCONNECTED:
-		signal = BT_MAP_DISCONNECTED;
-		BT_INFO_C("Disconnected [MAP]");
-		break;
-	case BLUETOOTH_EVENT_MAP_LIST_FOLDERS_COMPLETE:
-		signal = BT_MAP_LIST_FOLDERS_COMPLETE;
-		BT_INFO_C("Completed list folders operation[MAP]");
-		break;
-	case BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE:
-		signal = BT_MAP_FILTER_FIELDS_COMPLETE;
-		BT_INFO_C("Completed list filters field operation[MAP]");
-		break;
-	case BLUETOOTH_EVENT_MAP_LIST_MESSAGES_COMPLETE:
-		signal = BT_MAP_LIST_MESSAGES_COMPLETE;
-		BT_INFO_C("Completed list messages operation [MAP]");
-		break;
-	case BLUETOOTH_EVENT_MAP_GET_MESSAGE_COMPLETE:
-		signal = BT_MAP_GET_MESSAGE_COMPLETE;
-		BT_INFO_C("Completed get message operation [MAP]");
-		break;
-	case BLUETOOTH_EVENT_MAP_PUSH_MESSAGE_COMPLETE:
-		signal = BT_MAP_PUSH_MESSAGE_COMPLETE;
-		BT_INFO_C("Completed push message operation [MAP]");
-		break;
 	case BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_CONNECTED:
 		signal = BT_TRANSFER_CONNECTED;
 		break;
@@ -455,12 +421,12 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BLUETOOTH_EVENT_LE_DATA_LENGTH_CHANGED:
 		signal = BT_LE_DATA_LENGTH_CHANGED;
 		break;
+	case BLUETOOTH_EVENT_REMOTE_IBEACON_DEVICE_FOUND:
+		signal = BT_IBEACON_DEVICE_FOUND;
+		break;
 	case BLUETOOTH_EVENT_PXP_PROPERTY_CHANGED:
 		signal = BT_PXP_PROPERTY_CHANGED;
 		break;
-	case BLUETOOTH_EVENT_OTP_SERVER_STATE_CHANGED:
-		signal = BT_OTP_SERVER_STATE_CHANGED;
-		break;
 	default:
 		BT_ERR("Unknown event");
 		return BLUETOOTH_ERROR_INTERNAL;
@@ -476,7 +442,7 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 
 	g_object_unref(msg1);
 
-#ifdef TIZEN_FEATURE_BT_HPS
+#ifdef HPS_FEATURE
 	if (g_strcmp0(signal, BT_LE_ENABLED) == 0)
 		_bt_send_to_hps();
 #endif
@@ -505,12 +471,6 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
 	case BT_DEVICE_EVENT:
 		path = BT_DEVICE_PATH;
 		break;
-	case BT_TDS_EVENT:
-		path = BT_TDS_PATH;
-		break;
-	case BT_OTP_EVENT:
-		path = BT_OTP_PATH;
-		break;
 	default:
 		BT_ERR("Unknown event");
 		return BLUETOOTH_ERROR_INTERNAL;
@@ -538,27 +498,6 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
 	case BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED:
 		signal = BT_GATT_CHAR_VAL_CHANGED;
 		break;
-	case BLUETOOTH_EVENT_TDS_ACTIVATION_REQUESTED:
-		signal = BT_TDS_ACTIVATION_REQUESTED;
-		break;
-	case BLUETOOTH_EVENT_TDS_TRANSPORT_DATA_RECEIVED:
-		signal = BT_TDS_TRANSPORT_DATA_RECEIVED;
-		break;
-	case BLUETOOTH_EVENT_TDS_ACTIVATION_INDICATION:
-		signal = BT_TDS_ACTIVATION_INDICATION;
-		break;
-	case BLUETOOTH_EVENT_TDS_CONTROL_POINT_ENABLED:
-		signal = BT_TDS_CONTROL_POINT_ENABLED;
-		break;
-	case BLUETOOTH_EVENT_TDS_ACTIVATION_RESULT:
-		signal = BT_TDS_ACTIVATION_RESULT;
-		break;
-	case BLUETOOTH_EVENT_OTP_READ_CHAR_VAL:
-		signal = BT_OTP_READ_CHAR_VAL;
-		break;
-	case BLUETOOTH_EVENT_OTP_NOTIFICATION_ENABLED:
-		signal = BT_OTP_NOTIFICATION_ENABLED;
-		break;
 	default:
 		BT_ERR("Unknown event");
 		return BLUETOOTH_ERROR_INTERNAL;
@@ -613,7 +552,6 @@ int _bt_init_service_event_sender(void)
 	}
 
 	conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-
 	if (conn == NULL) {
 		BT_ERR("conn == NULL");
 		if (err) {
@@ -648,7 +586,6 @@ int _bt_init_hf_local_term_event_sender(void)
 	}
 
 	conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-
 	if (conn == NULL) {
 		BT_ERR("conn == NULL");
 		if (err) {
@@ -695,4 +632,3 @@ int _bt_send_dump_signal(char *signal)
 
 	return BLUETOOTH_ERROR_NONE;
 }
-