[Adapt] Include proper data size in events from OAL to service

Apart from fixing data size in OAL events, this patch
also takes care of following

- Include some DEBUG prints
- Remove redundant codes in A2DP src role

Change-Id: Ib6dd1086195be415c8cb026eff8ebc34bec72de6
Signed-off-by: Anupam Roy <anupam.r@samsung.com>

diff --git a/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c
index 7a19d20..ee862ce 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c
@@ -1216,6 +1216,8 @@ static gboolean __bt_adapter_bonded_devices_cb(gpointer user_data)
        ev->num_props = 0;
        ev->status = BT_STATUS_SUCCESS;
 
+       INFO("Size [%d]", size);
+
        /* signature of GetManagedObjects:  a{oa{sa{sv}}} */
        g_variant_get(result, "(a{oa{sa{sv}}})", &iter);
 

diff --git a/bt-oal/bluez_hal/src/bt-hal-adapter-le.c b/bt-oal/bluez_hal/src/bt-hal-adapter-le.c
index a69e050..ec820e4 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-adapter-le.c
+++ b/bt-oal/bluez_hal/src/bt-hal-adapter-le.c
@@ -1,5 +1,9 @@
 /*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+ * BLUETOOTH HAL
+ *
+ * Copyright (c) 2015 -2016 Samsung Electronics Co., Ltd All Rights Reserved.
+ *
+ * Contact: Anupam Roy <anupam.r@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/bt-oal/bluez_hal/src/bt-hal-event-receiver.c b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
index 9ffbb73..fc84d56 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
+++ b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
@@ -822,6 +822,7 @@ static gboolean __bt_hal_event_manager(gpointer data)
 
                        /* TODO: Handle Bluetoothd terminating scenario */
                }
+               INFO("Name Owner changed [%s]", name);
                g_free(name);
                g_free(previous);
                g_free(current);

diff --git a/bt-oal/oal-adapter-mgr.c b/bt-oal/oal-adapter-mgr.c
index affd1db..7f26147 100755 (executable)
--- a/bt-oal/oal-adapter-mgr.c
+++ b/bt-oal/oal-adapter-mgr.c
@@ -569,7 +569,7 @@ static void cb_adapter_properties(bt_status_t status,
 
                                /* Application has requested this property SET/GET hence send EVENT */
                                send_event(OAL_EVENT_ADAPTER_PROPERTY_SERVICES,
-                                               uuids_event, (num_uuid * sizeof(bt_uuid_t)));
+                                               uuids_event, (sizeof(event_adapter_services_t) + num_uuid * sizeof(bt_uuid_t)));
                        }
                        break;
                }
@@ -627,7 +627,7 @@ static void cb_adapter_properties(bt_status_t status,
                                memcpy(event_data->devices[j].addr, bonded_addr_list[j].address, 6);
 
                        send_event(OAL_EVENT_ADAPTER_BONDED_DEVICE_LIST,
-                                       event_data, (num_bonded * sizeof(bt_bdaddr_t)));
+                                       event_data, (sizeof(event_device_list_t) + num_bonded * sizeof(bt_bdaddr_t)));
                        break;
                }
                default:

diff --git a/bt-oal/oal-device-mgr.c b/bt-oal/oal-device-mgr.c
index bffdf7e..cc5e621 100755 (executable)
--- a/bt-oal/oal-device-mgr.c
+++ b/bt-oal/oal-device-mgr.c
@@ -513,7 +513,7 @@ void cb_device_bond_state_changed(bt_status_t status, bt_bdaddr_t *bd_addr,
                        g_free(address);
                        return;
        }
-       send_event_bda_trace(event, address, size, (bt_address_t*)bd_addr);
+       send_event_bda_trace(event, address, sizeof(bt_address_t), (bt_address_t*)bd_addr);
 }
 
 void cb_device_acl_state_changed(bt_status_t status, bt_bdaddr_t *bd_addr,

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
index 1cc39c7..9435d15 100644 (file)
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
@@ -679,6 +679,7 @@ static void __bt_adapter_event_handler(int event_type, gpointer event_data)
                                        BLUETOOTH_ADDRESS_LENGTH);
                }
 
+               BT_INFO("Adapter Bonded device List count: [%d]", count);
                __bt_adapter_handle_pending_requests(BT_GET_BONDED_DEVICES,
                                (void *)addr_list, bonded_device_list->num);
                break;
@@ -897,7 +898,7 @@ static void __bt_adapter_handle_pending_requests(int service_function, void *use
                        if (NULL != req_info->user_data)
                                continue;
 
-                       BT_DBG("BT_GET_BONDED_DEVICES: count = [%d]", count);
+                       BT_DBG("Total num of bonded devices = [%d]", count);
                        /* No bonded devices, return method invocation */
                        if (0 == count || !addr_list)
                                break;

diff --git a/bt-service-adaptation/services/audio/a2dp_src/bt-service-a2dp-src.c b/bt-service-adaptation/services/audio/a2dp_src/bt-service-a2dp-src.c
index cf2aed3..ec94a7b 100644 (file)
--- a/bt-service-adaptation/services/audio/a2dp_src/bt-service-a2dp-src.c
+++ b/bt-service-adaptation/services/audio/a2dp_src/bt-service-a2dp-src.c
@@ -238,6 +238,7 @@ static void __bt_handle_av_audio_started(bluetooth_device_address_t *address)
        BT_INFO("Currently not handled..");
 }
 
+#if 0
 static void __bt_reply_av_disconnection_pending_request(bluetooth_device_address_t *address)
 {
        BT_DBG("+");
@@ -272,6 +273,7 @@ static void __bt_reply_av_disconnection_pending_request(bluetooth_device_address
        g_free(req_info->user_data);
        _bt_free_info_from_invocation_list(req_info);
 }
+#endif
 
 static void __bt_reply_av_connection_pending_request(bluetooth_device_address_t *address)
 {
@@ -329,7 +331,7 @@ void _bt_a2dp_source_event_handler(int oal_event, gpointer event_data)
                        break;
                 case OAL_EVENT_AUDIO_DISCONNECTING:
                        BT_INFO("A2DP Profile disconnecting, no need to handle event..");
-                       __bt_reply_av_disconnection_pending_request(bd_addr);
+                       //__bt_reply_av_disconnection_pending_request(bd_addr);
                        break;
                 case OAL_EVENT_AUDIO_CONNECTED:
                        BT_INFO("A2DP Audio Profile connected..");