Merge "[Bluetooth][OTP] Add object browsing support" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-event-sender.c

diff --git a/bt-service/bt-service-event-sender.c b/bt-service/bt-service-event-sender.c
index 5028fa0..a5ccbe2 100644 (file)
--- 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 HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 int _bt_send_to_hps(void)
 {
        gboolean ret = FALSE;
@@ -100,6 +100,9 @@ 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;
@@ -112,6 +115,9 @@ 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;
@@ -317,6 +323,34 @@ 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;
@@ -421,6 +455,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_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;
@@ -431,13 +471,12 @@ 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);
 
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
        if (g_strcmp0(signal, BT_LE_ENABLED) == 0)
                _bt_send_to_hps();
 #endif
@@ -466,6 +505,12 @@ 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;
@@ -493,6 +538,33 @@ 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;
+       case BLUETOOTH_EVENT_OTP_WRITE_CHAR_VAL:
+               signal = BT_OTP_WRITE_CHAR_VAL;
+               break;
+       case BLUETOOTH_EVENT_OTP_INDICATION:
+               signal = BT_OTP_INDICATION;
+               break;
        default:
                BT_ERR("Unknown event");
                return BLUETOOTH_ERROR_INTERNAL;
@@ -547,7 +619,7 @@ int _bt_init_service_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) {
@@ -582,7 +654,7 @@ 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) {