X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-event-sender.c;h=4dc469194ac94d2b7d378b000bd3483b6fcd5bfc;hb=1fa07edcd0e77a445700975773db3300f556caf5;hp=8d83d8a6789308ff6a204d3f8e9eca324a755c39;hpb=4341e1ed25d943162e7f47d3392fc7701812c95e;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 8d83d8a..4dc4691 100644
--- a/bt-service/bt-service-event-sender.c
+++ b/bt-service/bt-service-event-sender.c
@@ -58,7 +58,6 @@ int _bt_send_to_hps(void)
 
 int _bt_send_event(int event_type, int event, GVariant *param)
 {
-	BT_DBG("+");
 	char *path;
 	char *signal;
 	GDBusMessage *msg1 = NULL;
@@ -80,6 +79,9 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BT_HID_EVENT:
 		path = BT_HID_PATH;
 		break;
+	case BT_HID_DEVICE_EVENT:
+		path = BT_HID_DEVICE_PATH;
+		break;
 	case BT_HEADSET_EVENT:
 		path = BT_HEADSET_PATH;
 		break;
@@ -107,9 +109,9 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BT_RFCOMM_SERVER_EVENT:
 		path = BT_RFCOMM_SERVER_PATH;
 		break;
-        case BT_A2DP_SOURCE_EVENT:
-                path = BT_A2DP_SOURCE_PATH;
-                break;
+	case BT_A2DP_SOURCE_EVENT:
+		path = BT_A2DP_SOURCE_PATH;
+		break;
 	default:
 		BT_ERR("Unknown event");
 		return BLUETOOTH_ERROR_INTERNAL;
@@ -118,9 +120,11 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	switch (event) {
 	case BLUETOOTH_EVENT_ENABLED:
 		signal = BT_ENABLED;
+		BT_INFO_C("### BT Enabled");
 		break;
 	case BLUETOOTH_EVENT_DISABLED:
 		signal = BT_DISABLED;
+		BT_INFO_C("### BT Disabled");
 		break;
 	case BLUETOOTH_EVENT_LE_ENABLED:
 		signal = BT_LE_ENABLED;
@@ -194,6 +198,9 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BLUETOOTH_EVENT_RAW_RSSI:
 		signal = BT_RAW_RSSI_EVENT;
 		break;
+	case BLUETOOTH_EVENT_SUPPORTED_PROFILE_TRUSTED:
+		signal = BT_SUPPORTED_PROFILE_TRUSTED;
+		break;
 	case BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY:
 		signal = BT_KBD_PASSKEY_DISPLAY_REQ_RECEIVED;
 		break;
@@ -211,19 +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 [HID Device]");
+		break;
+	case BLUETOOTH_HID_DEVICE_DISCONNECTED:
+		signal = BT_INPUT_HID_DEVICE_DISCONNECTED;
+		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;
@@ -250,11 +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]");
+		break;
+	case BLUETOOTH_EVENT_AV_SOURCE_DISCONNECTED:
+		signal = BT_A2DP_SOURCE_DISCONNECTED;
+		BT_INFO_C("### Disconnected [A2DP Source]");
 		break;
 	case BLUETOOTH_EVENT_AG_AUDIO_CONNECTED:
 		signal = BT_SCO_CONNECTED;
@@ -337,14 +360,6 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BLUETOOTH_EVENT_DEVICE_DISCONNECTED:
 		signal = BT_DEVICE_DISCONNECTED;
 		break;
-	case BLUETOOTH_EVENT_AV_SOURCE_CONNECTED:
-		signal = BT_A2DP_SOURCE_CONNECTED;
-		BT_INFO_C("Connected [A2DP Source]");
-		break;
-    case BLUETOOTH_EVENT_AV_SOURCE_DISCONNECTED:
-        signal = BT_A2DP_SOURCE_DISCONNECTED;
-        BT_INFO_C("Disconnected [A2DP Source]");
-        break;
 	case BLUETOOTH_EVENT_AVRCP_CONNECTED:
 	case BLUETOOTH_EVENT_AVRCP_CONTROL_CONNECTED:
 		signal = BT_AVRCP_CONNECTED;
@@ -382,9 +397,14 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 		break;
 	case BLUETOOTH_EVENT_GATT_CONNECTED:
 		signal = BT_GATT_CONNECTED;
+		BT_INFO_C("### Connected [GATT]");
 		break;
 	case BLUETOOTH_EVENT_GATT_DISCONNECTED:
 		signal = BT_GATT_DISCONNECTED;
+		BT_INFO_C("### Disconnected [GATT]");
+		break;
+	case BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED:
+		signal = BT_GATT_REQ_ATT_MTU_CHANGED;
 		break;
 	case BLUETOOTH_EVENT_IPSP_INIT_STATE_CHANGED:
 		signal = BT_IPSP_INITIALIZED;
@@ -395,15 +415,18 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 	case BLUETOOTH_EVENT_IPSP_DISCONNECTED:
 		signal = BT_IPSP_DISCONNECTED;
 		break;
-	case BLUETOOTH_EVENT_IPSP_BT_INTERFACE_INFO:
-		signal = BT_IPSP_BT_INTERFACE_INFO;
-		break;
 	case BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED:
 		signal = BT_GATT_CHAR_VAL_CHANGED;
 		break;
 	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;
 	default:
 		BT_ERR("Unknown event");
 		return BLUETOOTH_ERROR_INTERNAL;
@@ -414,9 +437,8 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 
 	msg1 = g_dbus_message_new_signal(path, BT_EVENT_SERVICE, signal);
 	g_dbus_message_set_body(msg1, param);
-	if (!g_dbus_connection_send_message(event_conn, msg1, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 0, NULL)) {
+	if (!g_dbus_connection_send_message(event_conn, msg1, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 0, NULL))
 		BT_ERR("Error while sending");
-	}
 
 	g_object_unref(msg1);
 
@@ -431,14 +453,12 @@ int _bt_send_event(int event_type, int event, GVariant *param)
 int _bt_send_event_to_dest(const char* dest, int event_type,
 		int event, GVariant *param)
 {
-	BT_DBG("+");
 	char *path;
 	char *signal;
 	GError *error = NULL;
 
 	retv_if(event_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-	BT_DBG("dest : %s", dest);
 	BT_DBG("event_type [%d], event [%d]", event_type, event);
 
 	switch (event_type) {
@@ -449,7 +469,7 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
 		path = BT_LE_ADAPTER_PATH;
 		break;
 	case BT_DEVICE_EVENT:
-                path = BT_DEVICE_PATH;
+		path = BT_DEVICE_PATH;
 		break;
 	default:
 		BT_ERR("Unknown event");
@@ -463,6 +483,9 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
 	case BLUETOOTH_EVENT_ADVERTISING_STOPPED:
 		signal = BT_ADVERTISING_STOPPED;
 		break;
+	case BLUETOOTH_EVENT_PASSKEY_NOTIFICATION:
+		signal = BT_PASSKEY_NOTIFICATION;
+		break;
 	case BLUETOOTH_EVENT_LE_DISCOVERY_STARTED:
 		signal = BT_LE_DISCOVERY_STARTED;
 		break;
@@ -480,7 +503,6 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
 		return BLUETOOTH_ERROR_INTERNAL;
 	}
 
-	BT_DBG("Path : %s", path);
 	BT_INFO_C("Signal : %s", signal);
 
 	if (!g_dbus_connection_emit_signal(event_conn, dest, path, BT_EVENT_SERVICE,
@@ -493,7 +515,6 @@ int _bt_send_event_to_dest(const char* dest, int event_type,
 		}
 	}
 
-	BT_DBG("-");
 	return BLUETOOTH_ERROR_NONE;
 }
 
@@ -530,8 +551,7 @@ int _bt_init_service_event_sender(void)
 		return BLUETOOTH_ERROR_INTERNAL;
 	}
 
-	conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &err);
-	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+	conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
 	if (conn == NULL) {
 		BT_ERR("conn == NULL");
 		if (err) {
@@ -566,7 +586,6 @@ int _bt_init_hf_local_term_event_sender(void)
 	}
 
 	conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-	retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 	if (conn == NULL) {
 		BT_ERR("conn == NULL");
 		if (err) {
@@ -590,3 +609,26 @@ void _bt_deinit_hf_local_term_event_sender(void)
 		hf_local_term_event_conn = NULL;
 	}
 }
+
+int _bt_send_dump_signal(char *signal)
+{
+	GError *error = NULL;
+	int32_t pid = getpid();
+
+	retv_if(event_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+
+	if (!g_dbus_connection_emit_signal(event_conn, NULL,
+			BT_DUMP_SERVICE_PATH,
+			BT_DUMP_SERVICE_INTERFACE,
+			signal, g_variant_new("(i)", pid),
+			&error)) {
+		BT_ERR("Error while sending Signal: %s", signal);
+		if (error) {
+			BT_ERR("Error Code [%d], Error Message [%s]",
+					error->code, error->message);
+			g_clear_error(&error);
+		}
+	}
+
+	return BLUETOOTH_ERROR_NONE;
+}