diff options
author | h.sandeep <h.sandeep@samsung.com> | 2015-02-19 20:56:30 +0530 |
---|---|---|
committer | h.sandeep <h.sandeep@samsung.com> | 2015-02-20 08:35:55 +0530 |
commit | eb07b442b3235581e481e8b91219a5db84d592f7 (patch) | |
tree | 979e7438a5ca7b6aa42767d806c25454dc12256b /src/bluetooth-common.c | |
parent | 2d3081d78a7d03d5ab899a01d97fbfb29241af57 (diff) | |
download | bluetooth-eb07b442b3235581e481e8b91219a5db84d592f7.tar.gz bluetooth-eb07b442b3235581e481e8b91219a5db84d592f7.tar.bz2 bluetooth-eb07b442b3235581e481e8b91219a5db84d592f7.zip |
Code Sync [Tizen3.0]: Applied tizen.org patches
1> Applied the tizen branch patches
2> Fix for x86_64 compatibility
3> Remove placeholders and cleanup spec
4> resetting manifest requested domain to floor
5> Fix manifests
6> do not return an error when user stops discovery
7> handle device disappear event
8> src/bluetooth-hdp: Fix unsigned var check
9> src/bluetooth-adapter: Fix variable reassigning issue
10> src/bluetooth-common: Fix variable reassigning issue
11> Merge the CAPI's header files from tizen 2.3 to tizen 3.0
Change-Id: Ic68449c544925230c9e27b8891704d209fbe5534
Signed-off-by: h.sandeep <h.sandeep@samsung.com>
Diffstat (limited to 'src/bluetooth-common.c')
-rwxr-xr-x | src/bluetooth-common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c index 1ee14df..65687aa 100755 --- a/src/bluetooth-common.c +++ b/src/bluetooth-common.c @@ -596,7 +596,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us telephony_event_callid_t *call_data = NULL; char *device_addr = NULL; int error_code = BT_ERROR_NONE; - int event_index = -1; + int event_index; bluetooth_network_device_info_t *dev_info = NULL; bt_hdp_connected_t *hdp_conn_info = NULL; bt_hdp_disconnected_t *hdp_disconn_info = NULL; @@ -651,7 +651,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us case BLUETOOTH_EVENT_DISCOVERY_FINISHED: BT_INFO("bt_adapter_device_discovery_state_changed_cb() will be called with BT_ADAPTER_DEVICE_DISCOVERY_FINISHED"); ((bt_adapter_device_discovery_state_changed_cb)bt_event_slot_container[event_index].callback) - (_bt_get_error_code(param->result), BT_ADAPTER_DEVICE_DISCOVERY_FINISHED, NULL, bt_event_slot_container[event_index].user_data); + (BT_ERROR_NONE, BT_ADAPTER_DEVICE_DISCOVERY_FINISHED, NULL, bt_event_slot_container[event_index].user_data); break; case BLUETOOTH_EVENT_REMOTE_DEVICE_NAME_UPDATED: BT_INFO("bt_adapter_device_discovery_state_changed_cb() will be called with BT_ADAPTER_DEVICE_DISCOVERY_FOUND"); @@ -664,6 +664,8 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us (_bt_get_error_code(param->result), BT_ADAPTER_DEVICE_DISCOVERY_FOUND, NULL, bt_event_slot_container[event_index].user_data); } break; + case BLUETOOTH_EVENT_REMOTE_DEVICE_DISAPPEARED: + break; case BLUETOOTH_EVENT_BONDING_FINISHED: BT_INFO("bt_device_bond_created_cb() will be called"); _bt_get_bt_device_info_s(&bonded_device, (bluetooth_device_info_t *)(param->param_data)); |